From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 29 Aug 2007 07:55:08 +0000 (+0000)
Subject: DEVEL15-windows-wix-64bit-aklog-20070829
X-Git-Tag: openafs-devel-1_5_25~40
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=703a0054d0e11f9c4889a2c1395d68de2f43a1e3;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-wix-64bit-aklog-20070829


enable the installation of aklog.exe and asetkey.exe on 64-bit
windows.


(cherry picked from commit 0d81b9662e75a36a76b2b708499b101abb9b3bb5)
---

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index d16d2068d..044aee0c3 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -108,9 +108,7 @@
                 <ComponentRef Id="cmf_translate_et_EXE" />
                 <ComponentRef Id="cmf_rxdebug_EXE" />
                 <ComponentRef Id="cmf_backup_EXE" />
-                <?if $(env.CPU) = "i386"?>
-            	    <ComponentRef Id="cmf_aklog_EXE" />
-	 	<?endif?>
+          	<ComponentRef Id="cmf_aklog_EXE" />
                 <ComponentRef Id="cmf_cmdebug_EXE" />
                 
                 <!-- Runtime -->
@@ -152,9 +150,7 @@
                 <ComponentRef Id="cmf_volserver_EXE" />
                 <ComponentRef Id="cmf_afskill_EXE" />
                 <ComponentRef Id="cmf_afssvrcfg_EXE" />
-		<?if $(env.CPU) = "i386"?>
-                	<ComponentRef Id="cmf_asetkey_EXE" />
-		<?endif?>
+                <ComponentRef Id="cmf_asetkey_EXE" />
                 <ComponentRef Id="cmf_bosctlsvc_EXE" />
                 <ComponentRef Id="cmf_bosserver_EXE" />
                 <ComponentRef Id="cmf_buserver_EXE" />
@@ -286,7 +282,6 @@
 				</Feature>
 			<?endif?>
 
-  <?if $(env.CPU) = "i386"?>
             <Feature Id="feaNetIDMgrPlugin" AllowAdvertise="no" Description="$(loc.StrNIDMPluginLongDesc)"
                     Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrNIDMPluginDesc)">
                     <ComponentRef Id="_afscreds_plugin" />
@@ -299,7 +294,6 @@
                     </Feature>
 	    <?endif?>
             </Feature>
-  <?endif?>
 
 		<ComponentRef Id="cmp_CommonDir" />
 
@@ -331,9 +325,7 @@
                 <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
 
                 <ComponentRef Id="rcm_BinsOnly_Parm" />
-                <?if $(env.CPU) = "i386"?>
-            	    <ComponentRef Id="cmf_aklog_EXE" />
-	 	<?endif?>
+            	<ComponentRef Id="cmf_aklog_EXE" />
                 <ComponentRef Id="cmf_cmdebug_EXE" />
                 
                 <!-- Runtime -->
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 92eb20a1c..6669d156a 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -949,11 +949,9 @@
                      <Component Win64="$(var.Win64)" Id="cmf_backup_EXE" Guid="$(var.cmf_backup_EXE_guid)">
                         <File Id="filebackup_EXE" Name="backup.exe" LongName="backup.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\backup.exe"/>
                     </Component>
-	            <?if $(env.CPU) = "i386"?>
-	                    <Component Win64="$(var.Win64)" Id="cmf_aklog_EXE" Guid="$(var.cmf_aklog_EXE_guid)">
-                        	<File Id="fileaklog_EXE" Name="aklog.exe" LongName="aklog.exe" KeyPath="yes" DiskId="1" />
-	                    </Component>
-		    <?endif?>
+	            <Component Win64="$(var.Win64)" Id="cmf_aklog_EXE" Guid="$(var.cmf_aklog_EXE_guid)">
+                        <File Id="fileaklog_EXE" Name="aklog.exe" LongName="aklog.exe" KeyPath="yes" DiskId="1" />
+	            </Component>
                      <Component Win64="$(var.Win64)" Id="cmf_cmdebug_EXE" Guid="$(var.cmf_cmdebug_EXE_guid)">
                         <File Id="filecmdebug_EXE" Name="cmdebug.exe" LongName="cmdebug.exe" KeyPath="yes" DiskId="1" />
                         <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
@@ -983,9 +981,7 @@
                         <File Id="filetranslate_et_PDB" Name="translet.pdb" LongName="translate_et.pdb" DiskId="1" src="$(var.BinDir)\translate_et.pdb"/>
                         <File Id="filerxdebug_PDB" Name="rxdebug.pdb" LongName="rxdebug.pdb" DiskId="1" src="$(var.EtcDir)\rxdebug.pdb"/>
                         <File Id="filebackup_PDB" Name="backup.pdb" LongName="backup.pdb" DiskId="1" src="$(var.EtcDir)\backup.pdb"/>
-			<?if $(env.CPU) = "i386"?>
-                        	<File Id="fileaklog_PDB" Name="aklog.pdb" LongName="aklog.pdb" DiskId="1" />
-			<?endif?>
+                        <File Id="fileaklog_PDB" Name="aklog.pdb" LongName="aklog.pdb" DiskId="1" />
                         <File Id="filecmdebug_PDB" Name="cmdebug.pdb" LongName="cmdebug.pdb" DiskId="1" />
                         <File Id="fileafs_shl_ext_PDB" Name="afsshext.pdb" LongName="afs_shl_ext.pdb" DiskId="1" />
   <?ifndef BinsOnly ?>
@@ -1021,11 +1017,9 @@
 -->
                                 </File>
                             </Component>
-			    <?if $(env.CPU) = "i386"?>
-                                    <Component Win64="$(var.Win64)" Id="cmf_asetkey_EXE" Guid="$(var.cmf_asetkey_EXE_guid)">
-                                	<File Id="fileasetkey_EXE" Name="asetk.exe" LongName="asetkey.exe" KeyPath="yes" DiskId="1" />
-	                            </Component>
-			    <?endif?>
+                            <Component Win64="$(var.Win64)" Id="cmf_asetkey_EXE" Guid="$(var.cmf_asetkey_EXE_guid)">
+                                <File Id="fileasetkey_EXE" Name="asetk.exe" LongName="asetkey.exe" KeyPath="yes" DiskId="1" />
+	                    </Component>
                              <Component Win64="$(var.Win64)" Id="cmf_bosctlsvc_EXE" Guid="$(var.cmf_bosctlsvc_EXE_guid)">
                                 <File Id="filebosctlsvc_EXE" Name="bosct.exe" LongName="bosctlsvc.exe" KeyPath="yes" DiskId="1" />
                                 <ServiceControl Id="TransarcAFSServer" Name="TransarcAFSServer" Stop="both" Remove="both" Wait="yes" />
@@ -1086,9 +1080,7 @@
                                 <File Id="filevolserver_PDB" Name="volse.pdb" LongName="volserver.pdb" DiskId="1" />
                                 <File Id="fileafskill_PDB" Name="afski.pdb" LongName="afskill.pdb" DiskId="1" />
                                 <File Id="fileafssvrcfg_PDB" Name="afssv.pdb" LongName="afssvrcfg.pdb" DiskId="1" />
-				<?if $(env.CPU) = "i386"?>
-                                	<File Id="fileasetkey_PDB" Name="asetk.pdb" LongName="asetkey.pdb" DiskId="1" />
-				<?endif?>
+                                <File Id="fileasetkey_PDB" Name="asetk.pdb" LongName="asetkey.pdb" DiskId="1" />
                                 <File Id="filebosctlsvc_PDB" Name="bosct.pdb" LongName="bosctlsvc.pdb" DiskId="1" />
                                 <File Id="filebosserver_PDB" Name="bosse.pdb" LongName="bosserver.pdb" DiskId="1" />
                                 <File Id="filebuserver_PDB" Name="buser.pdb" LongName="buserver.pdb" DiskId="1" />