From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 13 Aug 2012 22:01:47 +0000 (-0400)
Subject: Upgrade 64-bit KfW installations
X-Git-Tag: kfw-4.0-final~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408b8116048426715c9cfa69b36bd928e45aff23;p=thirdparty%2Fkrb5.git

Upgrade 64-bit KfW installations

We use separate UpgradeCodes for 32- and 64-bit installers, so
we must check for both of them when seeing if we are upgrading an
old/existing installation.

(cherry picked from commit 9470259dcd30c564af0eb30b9afbc9e0c492f79c)

ticket: 7335
status: resolved
---

diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index c7b86ac9ea..20a70e5ed7 100755
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -169,7 +169,7 @@
 	<AdminExecuteSequence />
         <InstallExecuteSequence>
 	<Custom Action="KillRunningProcesses" After="InstallValidate"/>
-	<RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW)</RemoveExistingProducts>
+	<RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW Or UPGRADEKFW64)</RemoveExistingProducts>
 	<Custom Action="RenameKrb5Ini_Cmd" Before="RenameKrb5Ini"/>
 	<Custom Action="RenameKrb5Ini" Before="InstallFinalize">SYSTEMKRB5INI &lt;&gt; ""</Custom>
 	<!-- When running with a UI, CCP_Success property is not passed down to the server. -->
@@ -196,7 +196,12 @@
         <Upgrade Id="61211594-AAA1-4A98-A299-757326763CC7">
             <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" />
         </Upgrade>
-       
+
+        <!-- KfW 64-bit MSI -->
+        <Upgrade Id="6DA9CD86-6028-4852-8C94-452CAC229244">
+            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW64" />
+        </Upgrade>
+
         <!-- NSIS installation -->
         <!-- The NSIS installation, being non-MSI, is detected and removed through other means. -->