Windows: Make the 32-bit tools install directory customizable.

diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index ab660c696a57f041a33f8271a48a04f72cac6f50..0ce4dc5d2c30de235a1e9548abc6e817e19923c4 100644 (file)
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -373,42 +373,62 @@
       <ComponentRef Id='comp.kcc' />
 
       <?ifdef LsaCache ?>
-      <?ifdef Target32?>
-      <ComponentGroupRef Id='comps.LSACache.32' />
-      <?endif?>
       <?ifdef Target64?>
       <ComponentGroupRef Id='comps.LSACache.64' />
+      <?else?>
+      <ComponentGroupRef Id='comps.LSACache.32' />
       <?endif?>
       <?endif?>
 
       <?ifdef ApiCache ?>
-      <?ifdef Target32?>
-      <ComponentGroupRef Id='comps.APICache.32' />
-      <?endif?>
       <?ifdef Target64?>
       <ComponentGroupRef Id='comps.APICache.64' />
+      <?else?>
+      <ComponentGroupRef Id='comps.APICache.32' />
       <?endif?>
       <?endif?>
 
       <?ifdef MKShim ?>
-      <?ifdef Target32?>
-      <ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
-      <?endif?>
       <?ifdef Target64?>
       <ComponentGroupRef Id='comp.Heimdal.MKShim.64' />
+      <?else?>
+      <ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
       <?endif?>
       <?endif?>
 
-      <?ifdef Target32?>
+      <?ifdef Target64?>
+      <MergeRef Id='Heimdal.Assemblies.64' />
+      <MergeRef Id='Heimdal.Policy.64' />
+      <MergeRef Id='Runtime.64' />
+      <?else?>
       <MergeRef Id='Heimdal.Assemblies.32' />
       <MergeRef Id='Heimdal.Policy.32' />
       <MergeRef Id='Runtime.32' />
       <?endif?>
 
+      <?ifdef Target32?>
       <?ifdef Target64?>
-      <MergeRef Id='Heimdal.Assemblies.64' />
-      <MergeRef Id='Heimdal.Policy.64' />
-      <MergeRef Id='Runtime.64' />
+      <!-- If we are building the combined installer, the 32-bit
+           libraries go into a separate feature. -->
+      <Feature Id='feature.32BitLibraries'
+               ConfigurableDirectory='INSTALLDIR32'
+               Title='!(loc.Fea32BitTitle)'
+               Description='!(loc.Fea32BitDesc)'
+               Level='1' TypicalDefault='install' InstallDefault='local'>
+        <?ifdef LsaCache ?>
+        <ComponentGroupRef Id='comps.LSACache.32' />
+        <?endif?>
+        <?ifdef ApiCache ?>
+        <ComponentGroupRef Id='comps.APICache.32' />
+        <?endif?>
+        <?ifdef MKShim ?>
+        <ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
+        <?endif?>
+        <MergeRef Id='Heimdal.Assemblies.32' />
+        <MergeRef Id='Heimdal.Policy.32' />
+        <MergeRef Id='Runtime.32' />
+      </Feature>
+      <?endif?>
       <?endif?>
 
     </Feature>

diff --git a/packages/windows/installer/lang/en-us.wxl b/packages/windows/installer/lang/en-us.wxl
index 1bfca33cdbf6381cda7f6e318dfdbdc9e62ddc91..be2342e7d38bcb0f4b9e9d4ee9da57f72836604e 100644 (file)
--- a/packages/windows/installer/lang/en-us.wxl
+++ b/packages/windows/installer/lang/en-us.wxl
@@ -8,6 +8,8 @@
   <String Id='Comments'></String>
   <String Id='FeaMainTitle'>Heimdal</String>
   <String Id='FeaMainDesc'>Command line tools and libraries for Heimdal Kerberos</String>
-  <String Id='AdminRequired'>Installation of this package requires elevation.</String>
+  <String Id='Fea32BitTitle'>32-bit tools and libraries</String>
+  <String Id='Fea32BitDesc'>Compatibility libraries for 32-bit applications</String>
+  <String Id='AdminRequired'>Installation of this package requires elevation</String>
   <String Id='AlreadyInstalled'>A current or newer version of Heimdal is already installed on this machine.  Please use the Add/Remove Programs control panel to manage the existing installation.</String>
 </WixLocalization>