diff options
-rw-r--r-- | win/Tkzinc.wxs.in (renamed from win/Tkzinc.wxs) | 75 |
1 files changed, 59 insertions, 16 deletions
diff --git a/win/Tkzinc.wxs b/win/Tkzinc.wxs.in index 80c147d..85b4179 100644 --- a/win/Tkzinc.wxs +++ b/win/Tkzinc.wxs.in @@ -14,39 +14,72 @@ <!-- Get the version and install location of the various Active products --> <!-- from the registry --> + <Property Id="RequiredTclVersion">8.4.9.0</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> + <Property Id="TkzincDLLVersion">@MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@</Property> + <Property Id='ACTIVE_TCL_VERSION'> <RegistrySearch Id='ActiveTclRegVersion' Type='registry' Root="HKLM" Key='SOFTWARE\ActiveState\ActiveTcl' Name='CurrentVersion' /> - </Property> - <Property Id='ACTIVE_TCL_DIR'> - <RegistrySearch Id='ActiveTclRegDir' Type='registry' - Root="HKLM" Key='SOFTWARE\ActiveState\ActiveTcl\[ACTIVE_TCL_VERSION]' /> - </Property> + </Property> <Property Id='ACTIVE_PERL_VERSION'> <RegistrySearch Id='ActivePerlRegVersion' Type='registry' Root="HKLM" Key='SOFTWARE\ActiveState\ActivePerl' Name='CurrentVersion' /> </Property> + <Property Id='ACTIVE_PYTHON_VERSION'> + <RegistrySearch Id='ActivePythonRegVersion' Type='registry' + Root="HKLM" Key='SOFTWARE\ActiveState\ActivePython' Name='CurrentVersion' /> + </Property> + <Property Id='ACTIVE_TCL_DIR'> + <RegistrySearch Id='ActiveTclRegDir' Type='registry' + Root="HKLM" Key='SOFTWARE\ActiveState\ActiveTcl\[RequiredTclVersion]' /> + </Property> <Property Id='ACTIVE_PERL_DIR'> <RegistrySearch Id='ActivePerlRegDir' Type='registry' - Root="HKLM" Key='SOFTWARE\ActiveState\ActivePerl\[ACTIVE_PERL_VERSION]' /> - </Property> + Root="HKLM" Key='SOFTWARE\ActiveState\ActivePerl\[RequiredPerlVersion]' /> + </Property> + <Property Id='ACTIVE_PYTHON_DIR'> + <RegistrySearch Id='ActivePythonRegDir' Type='registry' + Root="HKLM" Key='SOFTWARE\ActiveState\ActivePython\[RequiredPythonVersion]' /> + </Property> - <Property Id="RequiredTclVersion">8.4.9.0</Property> - <Property Id="RequiredPerlVersion">811</Property> - <!-- Description of the files into components --> <Directory Id='TARGETDIR' Name='SourceDir'> + <Directory Id='ACTIVE_PYTHON_DIR' Name='Python'> + <Directory Id='ActivePythonTcl' Name='tcl'> + <Directory Id='ActivePythonTclTkzinc' Name='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@' LongName='Tkzinc@MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@'> + <Component Id='PythonTcl' Guid='B1CF5C82-CE79-4EE2-91BB-49E3D808E6B9'> + <File Id='TkzincPythonDll' Name='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@.dll' LongName='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@.dll' + DiskId='1' src='buildtcl/Tkzinc@MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@.dll' Vital='yes' /> + <File Id='PythonpkgIndexTcl' Name='pkgIndex.tcl' DiskId='1' src='buildtcl/pkgIndex.tcl' Vital='yes' /> + <File Id='PythonZincGraphicsTcl' Name='znGraph.tcl' LongName='zincGraphics.tcl' DiskId='1' + src='buildtcl\zincGraphics.tcl' /> + <File Id='PythonZincTextTcl' Name='znText.tcl' LongName='zincText.tcl' DiskId='1' src='buildtcl\zincText.tcl' /> + <File Id='PythonZincLogoTcl' Name='znLogo.tcl' LongName='zincLogo.tcl' DiskId='1' src='buildtcl\zincLogo.tcl' /> + </Component> + </Directory> + </Directory> + <Directory Id='PythonTclLib' Name='Lib'> + <Component Id='PythonGlue' Guid='E2A2296C-0C53-40AB-9118-85706B5C2C42'> + <File Id='ZincPy' Name='Zinc.py' DiskId='1' src='..\Python\Zinc.py' Vital='yes' /> + </Component> + </Directory> + </Directory> <Directory Id='ACTIVE_TCL_DIR' Name='Tcl'> <Directory Id='ActiveTclLib' Name='lib'> - <Directory Id='TkzincLibDir' Name='Tkzinc33' LongName='Tkzinc3.3.0'> + <Directory Id='TkzincLibDir' Name='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@' LongName='Tkzinc@MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@'> <Component Id='TclDll' Guid='51BE30A0-A2EA-4514-B84E-43AC2CC19075'> - <File Id='TkzincDll' Name='Tkzinc33.dll' LongName='Tkzinc330.dll' - DiskId='1' src='buildtcl/Tkzinc330.dll' Vital='yes' /> + <File Id='TkzincDll' Name='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@.dll' LongName='Tkzinc@MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@.dll' + DiskId='1' src='buildtcl/Tkzinc@MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@.dll' Vital='yes' /> <File Id='pkgIndexTcl' Name='pkgIndex.tcl' DiskId='1' src='buildtcl/pkgIndex.tcl' Vital='yes' /> <File Id='zincGraphicsTcl' Name='znGraph.tcl' LongName='zincGraphics.tcl' DiskId='1' - src='buildtcl\zincGraphics.tcl' /> + src='buildtcl\zincGraphics.tcl' /> <File Id='zincTextTcl' Name='znText.tcl' LongName='zincText.tcl' DiskId='1' src='buildtcl\zincText.tcl' /> <File Id='zincLogoTcl' Name='znLogo.tcl' LongName='zincLogo.tcl' DiskId='1' src='buildtcl\zincLogo.tcl' /> <File Id='Readme' Name='README' DiskId='1' src='..\README' /> @@ -387,6 +420,12 @@ <ComponentRef Id='PerlDemosModules' /> </Feature> </Feature> + <Feature Id='ActivePythonZinc' Title='Tkzinc for Python' + Description='The Tkzinc package for ActivePython.' TypicalDefault='install' Level='1'> + <Condition Level='0'> NOT ACTIVE_PYTHON_VERSION = RequiredPythonVersion </Condition> + <ComponentRef Id='PythonTcl' /> + <ComponentRef Id='PythonGlue' /> + </Feature> </Feature> <!-- Icon used in the installer UI --> @@ -845,9 +884,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 NOT ACTIVE_PERL_VERSION = RequiredPerlVersion)]]></Publish> + <Publish Event="NewDialog" Value="NotAvailDlg"><![CDATA[IAgree = "Yes" AND (NOT ACTIVE_TCL_VERSION = RequiredTclVersion OR NOT ACTIVE_PERL_VERSION = RequiredPerlVersion OR NOT ACTIVE_PYTHON_VERSION = RequiredPythonVersion)]]></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]]></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> <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition> <Condition Action="enable">IAgree = "Yes"</Condition> </Control> @@ -879,6 +918,10 @@ <Text>Active Perl has not been found or it is not at the right version: [ACTIVE_PERL_VERSION] ([RequiredPerlVersion] needed)</Text> <Condition Action="hide">ACTIVE_PERL_VERSION = RequiredPerlVersion</Condition> </Control> + <Control Id="PythonWarning" Type="Text" X="45" Y="125" Width="300" Height="20"> + <Text>Active Python has not been found or it is not the right version: [ACTIVEPYDIR] [ACTIVE_PYTHON_VERSION] ([RequiredPythonVersion] needed)</Text> + <Condition Action="hide">ACTIVE_PYTHON_VERSION = RequiredPythonVersion</Condition> + </Control> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]"> <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> </Control> |