Windows: Set the ARPINSTALLLOCATION property when installing

The WiX based Windows Installer package for OpenAFS should set
the ARPINSTALLLOCATION property when installing.  This property
contains the main installation directory for the product and is
necessary for Windows Logo compliance.

Reviewed-on: http://gerrit.openafs.org/704
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/install/wix/oafwbins.wxs b/src/WINNT/install/wix/oafwbins.wxs
index f04b1d0875659a1ef4c0faddec1e126f1340d77c..f21eee6b181396f0f619fbd0170f67c6e5daa630 100644 (file)
--- a/src/WINNT/install/wix/oafwbins.wxs
+++ b/src/WINNT/install/wix/oafwbins.wxs
@@ -64,12 +64,18 @@
         
         <!-- User interface -->
         <?include lang\$(var.Language)\ui.wxi?>
-        
+
+        <CustomAction
+           Id="SetInstallLocation"
+           Property="ARPINSTALLLOCATION"
+           Value="[AFSDIR]" />
+
         <!-- Installation Sequences -->
         <AdvertiseExecuteSequence />
         <AdminExecuteSequence />
         <InstallExecuteSequence>
             <RemoveExistingProducts After="InstallValidate">(Not Installed) And (OPENAFSBIN_UPGRADE)</RemoveExistingProducts>
+            <Custom Action="SetInstallLocation" Before="RegisterProduct" />
         </InstallExecuteSequence>
 
         <!-- Related producs -->

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index b1f3548b802535cc32f8603bd07bae85651b88c5..127af093079e0eefbe6704ea97cdf4dc30b064a4 100644 (file)
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -213,6 +213,10 @@
                 BinaryKey="BIN_afsCustom"
                 DllEntry="AbortMsiImmediate"
                 Execute="immediate" />
+                <CustomAction
+                   Id="SetInstallLocation"
+                   Property="ARPINSTALLLOCATION"
+                   Value="[AFSDIR]" />
 
         <!-- Installation Sequences -->
         <AdvertiseExecuteSequence />
@@ -241,6 +245,7 @@
                        <!-- <Custom Action="RemoveAFSAdminGroup" Before="">&amp;feaClient=2</Custom> -->
                        <Custom Action="RollbackAFSAdminGroup" Before="CreateAFSAdminGroup">&amp;feaClient=3</Custom>
                        <Custom Action="CreateAFSAdminGroup" Before="CreateFolders">&amp;feaClient=3</Custom>
+                        <Custom Action="SetInstallLocation" Before="RegisterProduct" />
             <ScheduleReboot After="PublishProduct">&amp;feaClient=3 OR &amp;feaServer=3 OR &amp;feaClient=2 OR &amp;feaServer=2</ScheduleReboot>
         </InstallExecuteSequence>