[shibboleth-sp2] 53/82: SSPCPP-737 Further Installer bug fixes.

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch master
in repository shibboleth-sp2.

commit 3dfaa7c99b43838c497c6c8da46a323c7ce67faf
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Mon Jul 31 09:50:28 2017 +0100

    SSPCPP-737 Further Installer bug fixes.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-737
    
    - Allow same-version minor upgrades.
    - Cleanup the IIS integration such that we register if the DLL is
      going to be copied and deregister if it is going to be removed.
---
 iis7_shib/iis7_shib.rc | 15 ++++++++-------
 msi/WiX/IIsNatve.wxs   | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/iis7_shib/iis7_shib.rc b/iis7_shib/iis7_shib.rc
index c801718..dace537 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis7_shib/iis7_shib.rc
@@ -17,6 +17,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -50,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,1,255
- PRODUCTVERSION 0,0,1,255
+ FILEVERSION 0,0,1,0
+ PRODUCTVERSION 0,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,14 +67,14 @@ BEGIN
     BEGIN
         BLOCK "080904b0"
         BEGIN
-            VALUE "CompanyName", "Shibboleth Consortium\0"
-            VALUE "FileDescription", "Shibboleth IIIS7 Native Filter / Extension\0"
-            VALUE "FileVersion", "0.0.1.255"
+            VALUE "CompanyName", "Shibboleth Consortium"
+            VALUE "FileDescription", "Shibboleth IIIS7 Native Filter / Extension"
+            VALUE "FileVersion", "0.0.1.0"
             VALUE "InternalName", "iis7_shib.rc"
-            VALUE "LegalCopyright", "Copyright (C) 2017  UCAID\0"
+            VALUE "LegalCopyright", "Copyright (C) 2017  UCAID"
             VALUE "OriginalFilename", "iis7_shib.dll"
             VALUE "ProductName", "Shibboleth 2.6.0"
-            VALUE "ProductVersion", "0.0.1.255"
+            VALUE "ProductVersion", "0.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/msi/WiX/IIsNatve.wxs b/msi/WiX/IIsNatve.wxs
index 35af255..fa32f2b 100644
--- a/msi/WiX/IIsNatve.wxs
+++ b/msi/WiX/IIsNatve.wxs
@@ -2,11 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
     <Product Id="*" Name="Shibboleth IIS native server support: Downlevel installer " Language="1033" 
-                Version="0.1.0.0" Manufacturer="Shibboleth Consortium"
+                Version="0.2.0.0" Manufacturer="Shibboleth Consortium"
                 UpgradeCode="5d2542f1-deb7-41ef-a20f-4f85e5f66a71">
 	    <Package Description="IISNative DownLevel Installer" InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform="x64" />
 
-	    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+	    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" MigrateFeatures='yes' />
 	    <MediaTemplate  EmbedCab="yes"/>
 
         <Upgrade Id="$(var.ShibbolethUpgradeCode)">
@@ -83,10 +83,10 @@
         <CustomAction Id="QtUninstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
         <InstallExecuteSequence>
-            <Custom Action="SetQtInstall" After="InstallFiles">NOT Installed</Custom>
-            <Custom Action="QtInstall" After="SetQtInstall">NOT Installed</Custom>
-            <Custom Action="SetQtUninstall" After="CostInitialize">Installed</Custom>
-            <Custom Action="QtUninstall" Before="RemoveFiles">Installed</Custom>
+            <Custom Action="SetQtInstall" After="InstallFiles">$iis7 = 3</Custom> <!-- action = local == install -->
+            <Custom Action="QtInstall" After="SetQtInstall">$iis7 = 3</Custom>
+            <Custom Action="SetQtUninstall" After="CostFinalize">$iis7 = 2</Custom><!-- action = absent == uninstall -->
+            <Custom Action="QtUninstall" Before="RemoveFiles">$iis7 = 2</Custom>
         </InstallExecuteSequence>
 
         <!-- From ShibbolethSP-noarch -->

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git