Each sub package can be relocated wherever the installer wants it to go.

Fixed fake constraints on versions.

1 files changed, 23 insertions, 27 deletions

diff --git a/win/Tkzinc.wxs.in b/win/Tkzinc.wxs.in
index d110140..58efdd7 100644
--- a/win/Tkzinc.wxs.in
+++ b/win/Tkzinc.wxs.in
@@ -14,9 +14,9 @@
     <!-- Get the version and install location of the various Active products -->
     <!-- from the registry -->
 
-    <Property Id="RequiredTclVersion">8.5</Property>
-    <Property Id="RequiredPerlVersion">812</Property>
-    <Property Id="RequiredPythonVersion">246</Property>
+    <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>
@@ -47,13 +47,23 @@
         Root="HKLM" Key="SOFTWARE\ActiveState\ActivePython\[ACTIVE_PYTHON_VERSION]" />
     </Property>
  
- 
     <!-- Assembly of the various components in selectable features and sub-features -->
 
+    <!-- This feature tree is a dummy used to force a proper order in the registry
+         searches (AppSearch table insert order) so that ACTIVE_TCL_VERSION is
+         available when ACTIVE_TCL_DIR is looked up, etc. I'd love to know how
+         to do it canonically. -->
+    <Feature Id='Dummy' Title="Dummy" Description='Dummy feature set.' Level='0' Display='hidden'>
+      <Feature Id='ACTIVE_TCL_VERSION' Title='DummySub' Level='0' />
+      <Feature Id='ACTIVE_PERL_VERSION' Title='DummySub' Level='0' />
+      <Feature Id='ACTIVE_PYTHON_VERSION' Title='DummySub' Level='0' />
+    </Feature>
+
     <Feature Id='Complete' Title="Tkzinc" Description='The complete package.'
       TypicalDefault='install' Display='expand' Level='1'>
       <Feature Id='ActiveTclZinc' Title='Tkzinc for Tcl'
-        Description='The Tkzinc package for ActiveTcl.' TypicalDefault='install' Level='1'>
+        Description='The Tkzinc package for ActiveTcl.' TypicalDefault='install' Level='1'
+        ConfigurableDirectory='ACTIVE_TCL_DIR'>
         <!-- <Condition Level='0'><![CDATA[NOT (ACTIVE_TCL_VERSION << RequiredTclVersion)]]></Condition> -->
         <Feature Id='ActiveTclZincLib' Title='Tkzinc Tcl module'
           Description='The Tkzinc library files and dll.' TypicalDefault='install' Level='1'>
@@ -71,7 +81,8 @@
         </Feature>
       </Feature>
       <Feature Id='ActivePerlZinc' Title='Tkzinc for Perl'
-        Description='The Tkzinc package for ActivePerl.' TypicalDefault='install' Level='1'>
+        Description='The Tkzinc package for ActivePerl.' TypicalDefault='install' Level='1'
+        ConfigurableDirectory='ACTIVE_PERL_DIR'>
         <!-- <Condition Level='0'><![CDATA[ACTIVE_PERL_VERSION < RequiredPerlVersion]]></Condition> -->
         <Feature Id='ActivePerlZincLib' Title='Tkzinc Perl module'
           Description='The Tkzinc library files and dll.' TypicalDefault='install' Level='1'>
@@ -89,7 +100,8 @@
         </Feature>
       </Feature>
       <Feature Id='ActivePythonZinc' Title='Tkzinc for Python'
-        Description='The Tkzinc package for ActivePython.' TypicalDefault='install' Level='1'>
+        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' />
@@ -97,23 +109,6 @@
       </Feature>
     </Feature>
 
-    <!-- This table is a dummy used to force a proper order in the registry
-         searches (AppSearch table insert order) so that ACTIVE_TCL_VERSION is
-         available when ACTIVE_TCL_DIR is looked up. I'd love to know how to do
-         it canonically. -->
-    <CustomTable Id='dummy'>
-      <Column Id='DummyCol' Type='string' PrimaryKey='yes' />
-      <Column Id='ACTIVE_TCL_VERSION' Type='string' PrimaryKey='no' />
-      <Column Id='ACTIVE_PERL_VERSION' Type='string' PrimaryKey='no' />
-      <Column Id='ACTIVE_PYTHON_VERSION' Type='string' PrimaryKey='no' />
-      <Row>
-        <Data Column='DummyCol'> 0 </Data>
-        <Data Column='ACTIVE_TCL_VERSION'> 0 </Data>
-        <Data Column='ACTIVE_PERL_VERSION'> 0 </Data>
-        <Data Column='ACTIVE_PYTHON_VERSION'> 0 </Data>
-      </Row>
-    </CustomTable>
-
     <!-- Description of the files into components -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ACTIVE_TCL_DIR' Name='Tcl'>
@@ -781,7 +776,8 @@
         <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="Tree of selections" />
         <Control Id="Browse" Type="PushButton" X="304" Y="200" Width="56" Height="17" Text="[ButtonText_Browse]">
           <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
-          <Condition Action="hide">Installed</Condition>
+          <!-- <Condition Action="hide">Installed</Condition> -->
+          <Condition Action="enable">1</Condition>
         </Control>
         <Control Id="Reset" Type="PushButton" X="42" Y="243" Width="56" Height="17" Text="[ButtonText_Reset]">
           <Publish Event="Reset" Value="0">1</Publish>
@@ -828,11 +824,11 @@
           <Text>&lt;The selection's path&gt;</Text>
           <Subscribe Event="SelectionPath" Attribute="Text" />
           <Subscribe Event="SelectionPathOn" Attribute="Visible" />
-          <Condition Action="hide">Installed</Condition>
+          <!-- <Condition Action="hide">Installed</Condition> -->
         </Control>
         <Control Id="LocationLabel" Type="Text" X="25" Y="200" Width="50" Height="10" Text="Location:">
           <Subscribe Event="SelectionPathOn" Attribute="Visible" />
-          <Condition Action="hide">Installed</Condition>
+          <!-- <Condition Action="hide">Installed</Condition> -->
         </Control>
       </Dialog>