DEVEL15-windows-wix-beta-upgrades-20070503

This change is not as important for OpenAFS as it was for KFW as
OpenAFS does not issue betas with the same build numbers as final
releases.  However, for users of daily builds when build numbers
are not being incremented it will provide benefit.

We modify the upgrade rules to include the current version number
and then block the uninstall if the currently installed package
is the one that is being installed.

The change applies to both the regular installer and the 32-bit
tools for WOW64 environments.

(cherry picked from commit 9f508ce443f1ef2103fbb74c6a094aef3aa96e86)

diff --git a/src/WINNT/install/wix/oafwbins.wxs b/src/WINNT/install/wix/oafwbins.wxs
index 0fef27e8ab28f1c21f508eab21c3d18a62d6d7b5..f04b1d0875659a1ef4c0faddec1e126f1340d77c 100644 (file)
--- a/src/WINNT/install/wix/oafwbins.wxs
+++ b/src/WINNT/install/wix/oafwbins.wxs
@@ -69,13 +69,13 @@
         <AdvertiseExecuteSequence />
         <AdminExecuteSequence />
         <InstallExecuteSequence>
-            <RemoveExistingProducts After="InstallValidate">OPENAFSBIN_UPGRADE</RemoveExistingProducts>
+            <RemoveExistingProducts After="InstallValidate">(Not Installed) And (OPENAFSBIN_UPGRADE)</RemoveExistingProducts>
         </InstallExecuteSequence>
 
         <!-- Related producs -->
-        <!-- MIT's OpenAFS MSI installer -->
+        <!-- OpenAFS MSI installer -->
         <Upgrade Id="A94D03E9-EF11-4B87-9B42-409016BD4B7C">
-            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMaximum="no" Maximum="$(var.NumericVersion)" MigrateFeatures="yes" Property="OPENAFSBIN_UPGRADE" />
+            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMaximum="yes" Maximum="$(var.NumericVersion)" MigrateFeatures="yes" Property="OPENAFSBIN_UPGRADE" />
         </Upgrade>
         
         <!-- Media -->

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index 3fde40ae813f8ca15ae643a4eea25b629cb645b2..a1f72348e577ee355a9b274a48a6b2c0d87a3570 100644 (file)
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -207,7 +207,7 @@
         <AdvertiseExecuteSequence />
         <AdminExecuteSequence />
         <InstallExecuteSequence>
-                       <RemoveExistingProducts After="InstallValidate">IBMAFS_UPGRADE OR OPENAFS_UPGRADE OR AFSPLUGIN_UPGRADE</RemoveExistingProducts>
+                       <RemoveExistingProducts After="InstallValidate">(Not Installed) And (IBMAFS_UPGRADE OR OPENAFS_UPGRADE OR AFSPLUGIN_UPGRADE)</RemoveExistingProducts>
                        <Custom Action="RemoveNsisInstallation" Before="AbortInstallationA">NSISUNINSTALL &lt;&gt; "" AND UILevel &gt;= 4</Custom>
                        <Custom Action="AbortInstallationA" Before="CostInitialize">NSISUNINSTALL &lt;&gt; "" AND UILevel &lt; 4</Custom>
                        <!-- Assert that if the server is going to be installed locally after this session, control center and client are also local -->
@@ -233,9 +233,9 @@
         </InstallExecuteSequence>
 
         <!-- Related producs -->
-        <!-- MIT's OpenAFS MSI installer -->
+        <!-- OpenAFS MSI installer -->
         <Upgrade Id="6823EEDD-84FC-4204-ABB3-A80D25779833">
-            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMaximum="no" Maximum="$(var.NumericVersion)" MigrateFeatures="yes" Property="OPENAFS_UPGRADE" />
+            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMaximum="yes" Maximum="$(var.NumericVersion)" MigrateFeatures="yes" Property="OPENAFS_UPGRADE" />
         </Upgrade>
         
         <!-- MIT's Transarc AFS MSI Installer -->