[commit] r1793 - trunk/Install

Mon Jan 9 17:37:57 CST 2012

Author: ksmyth
Date: Mon Jan  9 17:37:57 2012
New Revision: 1793

Log:
x64 msi: upgrade previous x86 installs

Modified:
   trunk/Install/GME.wxs

Modified: trunk/Install/GME.wxs
==============================================================================

--- trunk/Install/GME.wxs	Mon Jan  9 17:37:46 2012	(r1792)
+++ trunk/Install/GME.wxs	Mon Jan  9 17:37:57 2012	(r1793)
@@ -69,7 +69,16 @@
       <UpgradeVersion Minimum="$(var.VERSIONSTR)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
       <UpgradeVersion OnlyDetect="no" Minimum="1.0.0" IncludeMinimum="yes" Maximum="$(var.VERSIONSTR)" IncludeMaximum="no" Property="PREVIOUSFOUND"/>
     </Upgrade>
+    <?if $(sys.BUILDARCH)=x64 ?>
+    <Upgrade Id="dfdd761e-0979-4897-ac89-71f006d92bf8">
+      <UpgradeVersion Minimum="$(var.VERSIONSTR)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED_X86"/>
+      <UpgradeVersion OnlyDetect="no" Minimum="1.0.0" IncludeMinimum="yes" Maximum="$(var.VERSIONSTR)" IncludeMaximum="no" Property="PREVIOUSFOUND_X86"/>
+    </Upgrade>
+    <?endif?>
     <CustomActionRef Id="WixExitEarlyWithSuccess"/>
+    <?if $(sys.BUILDARCH)=x64 ?>
+    <SetProperty Id="NEWERVERSIONDETECTED" Value="1" After="FindRelatedProducts">NEWERVERSION_DETECTED_X86</SetProperty>
+    <?endif?>
 
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallValidate" />
