From: Asanka Herath <asanka@secure-endpoints.com>
Date: Wed, 21 Oct 2009 19:56:12 +0000 (-0400)
Subject: Windows: Set the ARPINSTALLLOCATION property when installing
X-Git-Tag: openafs-devel-1_5_66~19
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2a9263a451847f4f1fb4deff56ee68d73c70e5bc;p=packages%2Fo%2Fopenafs.git

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 f04b1d087..f21eee6b1 100644
--- 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 b1f3548b8..127af0930 100644
--- 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>