[commit] r1799 - trunk/Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Jan 11 14:39:05 2012
New Revision: 1799

Log:
Clearer newerversiondetected code

Modified:
   trunk/Install/GME.wxs

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Tue Jan 10 16:42:38 2012	(r1798)
+++ trunk/Install/GME.wxs	Wed Jan 11 14:39:05 2012	(r1799)
@@ -75,12 +75,12 @@
       <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>
     <InstallExecuteSequence>
-      <Custom Action="WixExitEarlyWithSuccess" After="SetNEWERVERSIONDETECTED">NEWERVERSIONDETECTED AND VersionNT &gt; 400</Custom>
+      <Custom Action="WixExitEarlyWithSuccess" After="FindRelatedProducts">NEWERVERSIONDETECTED OR NEWERVERSION_DETECTED_X86</Custom>
     </InstallExecuteSequence>
+    <?else?>
+    <CustomActionRef Id="WixExitEarlyWithSuccess"/>
     <?endif?>
 
     <InstallExecuteSequence>