From a1c2a5c10fad19b5ac194340965b23e32154b740 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Wed, 18 Oct 2006 14:56:32 +0000
Subject: Adaptation following TEA3 Suppression of Python version checking in
 the installer.

---
 win/Tkzinc.wxs.in  | 9 +++------
 win/makefile.vc.in | 2 +-
 win/package.tcl    | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'win')

diff --git a/win/Tkzinc.wxs.in b/win/Tkzinc.wxs.in
index 58efdd7..0fab2c0 100644
--- a/win/Tkzinc.wxs.in
+++ b/win/Tkzinc.wxs.in
@@ -16,7 +16,6 @@
 
     <Property Id="RequiredTclVersion">8.4</Property>
     <Property Id="RequiredPerlVersion">811</Property>
-    <Property Id="RequiredPythonVersion">245</Property>
 
     <Property Id="TkzincLongVersion">@MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@</Property>
     <Property Id="TkzincShortVersion">@MAJOR_VERSION@@MINOR_VERSION@</Property>
@@ -102,7 +101,6 @@
       <Feature Id='ActivePythonZinc' Title='Tkzinc for Python'
         Description='The Tkzinc package for ActivePython.' TypicalDefault='install' Level='1'
         ConfigurableDirectory='ACTIVE_PYTHON_DIR'>
-        <!-- <Condition Level='0'><![CDATA[ACTIVE_PYTHON_VERSION < RequiredPythonVersion]]></Condition> -->
         <ComponentRef Id='PythonTcl' />
         <ComponentRef Id='PythonGlue' />
         <ComponentRef Id='PythonDemo' />
@@ -910,9 +908,9 @@
           <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">
-          <Publish Event="NewDialog" Value="NotAvailDlg"><![CDATA[IAgree = "Yes" AND (NOT (ACTIVE_TCL_VERSION << RequiredTclVersion) OR (ACTIVE_PERL_VERSION < RequiredPerlVersion) OR (ACTIVE_PYTHON_VERSION < RequiredPythonVersion))]]></Publish>
+          <Publish Event="NewDialog" Value="NotAvailDlg"><![CDATA[IAgree = "Yes" AND (NOT (ACTIVE_TCL_VERSION << RequiredTclVersion) OR (ACTIVE_PERL_VERSION < RequiredPerlVersion))]]></Publish>
           <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
-          <Publish Event="NewDialog" Value="SetupTypeDlg"><![CDATA[IAgree = "Yes" AND (ACTIVE_TCL_VERSION << RequiredTclVersion) AND (ACTIVE_PERL_VERSION >= RequiredPerlVersion) AND (ACTIVE_PYTHON_VERSION >= RequiredPythonVersion)]]></Publish>
+          <Publish Event="NewDialog" Value="SetupTypeDlg"><![CDATA[IAgree = "Yes" AND (ACTIVE_TCL_VERSION << RequiredTclVersion) AND (ACTIVE_PERL_VERSION >= RequiredPerlVersion)]]></Publish>
           <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>
           <Condition Action="enable">IAgree = "Yes"</Condition>
         </Control>
@@ -945,8 +943,7 @@
           <Condition Action="hide"><![CDATA[ACTIVE_PERL_VERSION >= RequiredPerlVersion]]></Condition>
         </Control>
         <Control Id="PythonWarning" Type="Text" X="45" Y="125" Width="300" Height="20">
-          <Text>Active Python not found or not at the right version: [ACTIVE_PYTHON_VERSION] ([RequiredPythonVersion] or greater needed)</Text>
-          <Condition Action="hide"><![CDATA[ACTIVE_PYTHON_VERSION >= RequiredPythonVersion]]></Condition>
+          <Text>Active Python not found</Text>
         </Control>
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
           <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
diff --git a/win/makefile.vc.in b/win/makefile.vc.in
index 3d62427..069dd6f 100644
--- a/win/makefile.vc.in
+++ b/win/makefile.vc.in
@@ -73,7 +73,7 @@ DFLAGS= /DATC /DGL /DGL_PRINT_CONFIG
 #CDEBUG = /O2 /G6 /Gs
 # Debug
 CDEBUG = /Zi -Od
-CFLAGS = /c /W3 /nologo /YX $(CDEBUG) /D__STDC__ /DVERSION=$(VERSION) /DDLL_BUILD /DBUILD_Tkzinc $(DFLAGS)
+CFLAGS = /c /W3 /nologo /YX $(CDEBUG) /D__STDC__ /DPACKAGE_VERSION=$(VERSION) /DDLL_BUILD /DBUILD_Tkzinc $(DFLAGS)
 TKCPPFLAGS = /Fp$(tmpdir)\ $(INCLUDES) /DTCL_THREADS=1 /DUSE_TCL_STUBS /DUSE_TK_STUBS /D__STDC__
 
 #LFLAGS	= /DEBUG /nologo /machine:IX86 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib
diff --git a/win/package.tcl b/win/package.tcl
index fc3e1ff..9b26581 100644
--- a/win/package.tcl
+++ b/win/package.tcl
@@ -35,14 +35,13 @@ if { $todo eq "subst" || $todo eq "" } {
   puts "Performing configuration variables substitution..."
 
   set registredFiles {
-    { Python/library Zinc.py }
     { . starkit.tcl }
     { win makefile.vc }
     { win Tkzinc.wxs }
   }
 
-  set libFile "${package}${major}${minor}.dll"
-  set stubLibFile "${package}stub${major}${minor}.dll"
+  set libFile "Tkzinc${major}${minor}.dll"
+  set stubLibFile "Tkzincstub${major}${minor}.dll"
 
   #
   # Then substitute all occurences in known files
-- 
cgit v1.1