pull up r19541 from trunk

 r19541@cathode-dark-space:  jaltman | 2007-05-03 18:57:05 -0400
 ticket: new
 subject: Modify WIX installer to better support upgrading betas
 component: windows
 tags: pullup

 The WIX installers did not upgrade previous installations with the same
 version number as the current package being installed.  This would leave
 multiple installations of KFW x.y.z registered as being installed on the
 machine even though only the most recent install is being used.

 This commit instructs the Windows Installer to uninstall previous installations
 with the same version number (the Maximum Upgrade version) as the package
 that is being installed while ensuring that the package being installed
 will not be uninstalled if the installation is being modified or repaired.

ticket: 5554
version_fixed: 1.6.2

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19591 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index f6262459d108ac16d38061e9fa0a947ffafff28e..6d0883c5ff1c5d08b3efc4d88ab534fb9827289e 100644 (file)
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -148,7 +148,7 @@
        <AdminExecuteSequence />
         <InstallExecuteSequence>
        <Custom Action="KillRunningProcesses" After="InstallValidate"/>
-       <RemoveExistingProducts After="KillRunningProcesses">UPGRADEPISMERE Or UPGRADEKFW</RemoveExistingProducts>
+       <RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW)</RemoveExistingProducts>
        <!-- When running with a UI, CCP_Success property is not passed down to the server. -->
        <Custom Action="AbortNoIE" Before="RemoveNsisInstallation">UILevel = 0 And (Not Installed) And (CCP_Success &lt;&gt; 1)</Custom>
        <Custom Action="RemoveNsisInstallation" Before="AbortCantRemoveNSIS">UPGRADENSIS &lt;&gt; "" And UILevel &gt;= 4</Custom>
@@ -171,7 +171,7 @@
         
         <!-- KfW MSI -->
         <Upgrade Id="61211594-AAA1-4A98-A299-757326763CC7">
-            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="no" MigrateFeatures="yes" Property="UPGRADEKFW" />
+            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" />
         </Upgrade>
        
         <!-- NSIS installation -->