From d2833aa7c02f09eff5c499dd44b9cc87a6e77f81 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Wed, 22 Jun 2005 12:05:01 +0000
Subject: Should close bug 25. With this patch, the installer will check if the
Tcl/Perl/Python version advertised in the registry is greater or equal to the
minimum required version. If some Active interpreter is not registered, a
warning is issued an the install proceed to a default location.
---
win/Tkzinc.wxs.in | 209 +++++++++++++++++++++++++++++-------------------------
1 file changed, 113 insertions(+), 96 deletions(-)
(limited to 'win')
diff --git a/win/Tkzinc.wxs.in b/win/Tkzinc.wxs.in
index 86ee7c0..d110140 100644
--- a/win/Tkzinc.wxs.in
+++ b/win/Tkzinc.wxs.in
@@ -14,9 +14,9 @@
- 8.4.9.0
- 811
- 245
+ 8.5
+ 812
+ 246
@MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@
@MAJOR_VERSION@@MINOR_VERSION@
@@ -36,53 +36,86 @@
+ Root="HKLM" Key="SOFTWARE\ActiveState\ActiveTcl\[ACTIVE_TCL_VERSION]" />
+ Root="HKLM" Key="SOFTWARE\ActiveState\ActivePerl\[ACTIVE_PERL_VERSION]" />
+ Root="HKLM" Key="SOFTWARE\ActiveState\ActivePython\[ACTIVE_PYTHON_VERSION]" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -390,57 +423,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- NOT ACTIVE_TCL_VERSION = RequiredTclVersion
-
-
-
-
-
-
-
-
-
-
-
-
-
- NOT ACTIVE_PERL_VERSION = RequiredPerlVersion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NOT ACTIVE_PYTHON_VERSION = RequiredPythonVersion
-
-
-
-
-
-
@@ -897,9 +914,9 @@
1
-
+
CostingComplete = 1
-
+ = RequiredPerlVersion) AND (ACTIVE_PYTHON_VERSION >= RequiredPythonVersion)]]>
"Yes"]]>
IAgree = "Yes"
@@ -924,16 +941,16 @@