[shibboleth-sp2] 41/82: SSPCPP-737 Installer (VS15 only) for IISNative package

Etienne Dysli Metref edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:23 UTC 2017


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 293c1251663844dabf2618862b429a836497535e
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Thu Jul 6 16:14:09 2017 +0100

    SSPCPP-737 Installer (VS15 only) for IISNative package
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-737
    
    Installs the updated config schema and an updated ISAPI dll
    as well as the IIS7 dll.
    
    Registers the IIS7 Dll, but does not deregister the ISAPI one.
---
 Projects/vc14/Shibboleth.sln              |  11 ++++
 Projects/vc14/iis7_shib/IIsNatve.wxs      | 106 ++++++++++++++++++++++++++++++
 Projects/vc14/iis7_shib/IisNative.wixproj |  49 ++++++++++++++
 isapi_shib/isapi_shib.rc                  |  41 +++++-------
 msi/WiX/IIsNatve.wxs                      |  89 +++++++++++++++++++++++++
 5 files changed, 271 insertions(+), 25 deletions(-)

diff --git a/Projects/vc14/Shibboleth.sln b/Projects/vc14/Shibboleth.sln
index 4bf08c9..c331bb4 100644
--- a/Projects/vc14/Shibboleth.sln
+++ b/Projects/vc14/Shibboleth.sln
@@ -188,6 +188,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iis7_shib", "iis7_shib\iis7
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC} = {303291A1-C542-49E4-80B3-9304B7B6F8BC}
 	EndProjectSection
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "IisNative", "iis7_shib\IisNative.wixproj", "{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD} = {CEE84E04-6A19-4F93-8FE5-98F9D22526DD}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -363,6 +368,11 @@ Global
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|Win32.Build.0 = Release|Win32
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|x64.ActiveCfg = Release|x64
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|x64.Build.0 = Release|x64
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}.Debug|Win32.ActiveCfg = Debug|x64
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}.Debug|x64.ActiveCfg = Debug|x64
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}.Release|Win32.ActiveCfg = Release|x64
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}.Release|x64.ActiveCfg = Release|x64
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -388,5 +398,6 @@ Global
 		{68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+		{1A2E6C72-A43F-46C7-BDA2-F2A8C7EE2DB1} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
 	EndGlobalSection
 EndGlobal
diff --git a/Projects/vc14/iis7_shib/IIsNatve.wxs b/Projects/vc14/iis7_shib/IIsNatve.wxs
new file mode 100644
index 0000000..2b29fe5
--- /dev/null
+++ b/Projects/vc14/iis7_shib/IIsNatve.wxs
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+    <Product Id="*" Name="Shibboleth IIS native server support: Downlevel installer " Language="1033" 
+                Version="0.0.1.255" 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." />
+	    <MediaTemplate  EmbedCab="yes"/>
+
+        <Upgrade Id="$(var.ShibbolethUpgradeCode)">
+            <UpgradeVersion Property="FOUNDSHIB" Minimum="2.6.0.0"  Maximum="2.7.0.0" OnlyDetect="yes"/>
+        </Upgrade>
+        <Condition Message="Existing Shibboleth Installation not found">FOUNDSHIB</Condition>
+        <Condition Message="IIS Not Found">IISMAJORVERSION</Condition>
+        <Condition Message="Install Dir Not Found">INSTALLDIR</Condition>
+
+        <Feature Id="IIsNative" Title="IisNative" Level="1">
+		    <ComponentRef Id="iis7" />
+            <ComponentRef Id="iis7D"/>
+            <ComponentRef Id="native_sp_config.xsd"/>
+            <ComponentRef Id="isapi_shib64.dll"/>
+            <ComponentRef Id="isapi_shib64.dll_debug"/>
+            <ComponentRef Id="PublicRWKey"/>
+        </Feature>
+
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="opt" Name="opt">
+                <Directory Id="INSTALLDIR" Name="shibboleth-sp"/>
+            </Directory>
+            <Directory Id="CommonAppDataFolder" Name="CommonFiles" >
+                <Directory Id="Shibboleth" Name="Shibboleth" >
+                    <Directory Id="SP" Name="SP" >
+                        <Directory Id="xml" Name="xml" >
+                            <Directory Id="xml_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\schemas" >
+                                <Component Id="native_sp_config.xsd" Guid="{5514B435-94AB-4A92-9737-0BEB78C146C8}">
+                                    <File KeyPath="yes" Id="native_sp_config.xsd" Name="shibboleth-2.0-native-sp-config.xsd" />
+                                </Component>
+                            </Directory>
+                        </Directory>
+                    </Directory>
+                </Directory>
+            </Directory>
+        </Directory>
+
+        <DirectoryRef Id="INSTALLDIR">
+            <Directory Id="lib64" Name="lib64">
+                <Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
+                    <Component Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Win64="yes" Id="iis7">
+                        <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" Id="iis7_shib_dll"/>
+                    </Component>
+                    <Component Id="isapi_shib64.dll" Guid="{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}" Win64="yes">
+                        <File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll" Name="isapi_shib.dll" />
+                    </Component>
+                    <Directory Id="lib64_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
+                        <Component Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Win64="yes" Id="iis7D">
+                            <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll"/>
+                        </Component>
+                        <Component Id="isapi_shib64.dll_debug" Guid="{60BC5679-A40E-42E5-9FC0-CCE924E660ED}" Win64="yes">
+                            <File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll_debug" Name="isapi_shib.dll" />
+                        </Component>
+                    </Directory>
+                </Directory>
+            </Directory>
+            <Component Id="PublicRWKey" Guid="{1D9E7BAE-12FD-459C-B1BB-4B70E916B711}" Win64="yes" Permanent="yes">
+                <RegistryKey ForceCreateOnInstall="yes"  Root="HKLM" Key="SOFTWARE\Shibboleth\PublicRWKey">
+                    <Permission User="Everyone" GenericAll="yes"/>
+                    <RegistryValue KeyPath="yes" Name="KeyPath" Value="0" Type="integer">
+                        <Permission User="Everyone" GenericAll="yes"/>
+                    </RegistryValue>
+                </RegistryKey>
+            </Component>
+        </DirectoryRef>
+                                
+        <CustomAction Id="SetQtInstall" Property="QtInstall"
+                Value=""[%systemroot]\system32\inetsrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib_dll]" /debug" />
+        <CustomAction Id="QtInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+
+        <CustomAction Id="SetQtUninstall" Property="QtUninstall"
+            Value="[%systemroot]\system32\inetsrv\appcmd.exe uninstall module ShibNative" />
+        <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>
+        </InstallExecuteSequence>
+
+        <!-- From ShibbolethSP-noarch -->
+        <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
+        <InstallExecuteSequence>
+            <Custom Action="InheritInstallDir" Before="LaunchConditions">OLD_INSTALLDIR</Custom>
+        </InstallExecuteSequence>
+        <InstallUISequence>
+            <Custom Action="InheritInstallDir" Before="LaunchConditions">OLD_INSTALLDIR</Custom>
+        </InstallUISequence>
+        <Property Id="OLD_INSTALLDIR" Secure="yes">
+            <RegistrySearch Id="OldInstallDir64" Root="HKLM" Key="SOFTWARE\Shibboleth"
+                            Name="InstallDir" Type="directory" Win64="yes"/>
+        </Property>
+        <PropertyRef Id="IISMAJORVERSION" />
+
+    </Product>
+</Wix>
diff --git a/Projects/vc14/iis7_shib/IisNative.wixproj b/Projects/vc14/iis7_shib/IisNative.wixproj
new file mode 100644
index 0000000..bba43d5
--- /dev/null
+++ b/Projects/vc14/iis7_shib/IisNative.wixproj
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- From Version -->
+    <ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
+    <MsVCVersion>vc14</MsVCVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>1a2e6c72-a43f-46c7-bda2-f2a8c7ee2db1</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>IisNative</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>ShibbolethUpgradeCode=$(ShibbolethUpgradeCode);MsVCVersion=$(MsVCVersion);SPBuildDirectory=$(SolutionDir)..\..\..\</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixIIsExtension">
+      <HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
+      <Name>WixIIsExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IIsNatve.wxs" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index d54ab83..41b19c5 100644
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -13,23 +13,20 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION 2,6,0,1
+ PRODUCTVERSION 2,6,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -44,18 +41,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Shibboleth Consortium\0"
-            VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
-            VALUE "FileVersion", "2, 6, 0, 0\0"
-            VALUE "InternalName", "isapi_shib\0"
-            VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "isapi_shib.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.6.0\0"
-            VALUE "ProductVersion", "2, 6, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
+            VALUE "CompanyName", "Shibboleth Consortium"
+            VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension"
+            VALUE "FileVersion", "2.6.0.1"
+            VALUE "InternalName", "isapi_shib"
+            VALUE "LegalCopyright", "Copyright � 2016 UCAID"
+            VALUE "OriginalFilename", "isapi_shib.dll"
+            VALUE "ProductName", "Shibboleth 2.6.0"
+            VALUE "ProductVersion", "2.6.0.1"
         END
     END
     BLOCK "VarFileInfo"
@@ -64,8 +57,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -73,18 +64,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -92,7 +83,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/msi/WiX/IIsNatve.wxs b/msi/WiX/IIsNatve.wxs
new file mode 100644
index 0000000..8bb20c5
--- /dev/null
+++ b/msi/WiX/IIsNatve.wxs
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+    <Product Id="*" Name="Shibboleth IIS native server support: Downlevel installer " Language="1033" 
+                Version="0.0.1.255" 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." />
+	    <MediaTemplate  EmbedCab='yes'/>
+
+        <Upgrade Id="$(var.ShibbolethUpgradeCode)">
+            <UpgradeVersion Property="FOUNDSHIB" Minimum="2.6.0.0"  Maximum="2.7.0.0" OnlyDetect="yes"/>
+        </Upgrade>
+        <Condition Message="Existing Shibboleth Installation not found">FOUNDSHIB</Condition>
+        <Condition Message="IIS Not Found">IISMAJORVERSION</Condition>
+        <Condition Message="Install Dir Not Found">INSTALLDIR</Condition>
+
+        <Feature Id="IIsNative" Title="IisNative" Level="1">
+		    <ComponentRef Id="iis7" />
+            <ComponentRef Id="iis7D"/>
+            <ComponentRef Id="native_sp_config.xsd"/>
+	    </Feature>
+
+        <Directory Id='TARGETDIR' Name='SourceDir'>
+            <Directory Id='opt' Name='opt'>
+                <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+            </Directory>
+            <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+                <Directory Id='Shibboleth' Name='Shibboleth' >
+                    <Directory Id='SP' Name='SP' >
+                        <Directory Id='xml' Name='xml' >
+                            <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >
+                                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
+                                    <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />
+                                </Component>
+                            </Directory>
+                        </Directory>
+                    </Directory>
+                </Directory>
+            </Directory>
+        </Directory>
+
+        <DirectoryRef Id='INSTALLDIR'>
+            <Directory Id="lib64" Name="lib64">
+                <Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
+                    <Component Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Win64="yes" Id="iis7">
+                        <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" Id="iis7_shib_dll"/>
+                    </Component>
+                    <Directory Id="lib64_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
+                        <Component Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Win64="yes" Id="iis7D">
+                            <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll"/>
+                        </Component>
+                    </Directory>
+                </Directory>
+            </Directory>
+        </DirectoryRef>
+                                
+        <CustomAction Id="SetQtInstall" Property="QtInstall"
+                Value=""[%systemroot]\system32\inetsrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib_dll]" /debug" />
+        <CustomAction Id="QtInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+
+        <CustomAction Id="SetQtUninstall" Property="QtUninstall"
+            Value="[%systemroot]\system32\inetsrv\appcmd.exe uninstall module ShibNative" />
+        <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>
+        </InstallExecuteSequence>
+
+        <!-- From ShibbolethSP-noarch -->
+        <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
+        <InstallExecuteSequence>
+            <Custom Action="InheritInstallDir" Before="LaunchConditions">OLD_INSTALLDIR</Custom>
+        </InstallExecuteSequence>
+        <InstallUISequence>
+            <Custom Action="InheritInstallDir" Before="LaunchConditions">OLD_INSTALLDIR</Custom>
+        </InstallUISequence>
+        <Property Id="OLD_INSTALLDIR" Secure="yes">
+            <RegistrySearch Id="OldInstallDir64" Root="HKLM" Key="SOFTWARE\Shibboleth"
+                            Name="InstallDir" Type="directory" Win64="yes"/>
+        </Property>
+        <PropertyRef Id="IISMAJORVERSION" />
+
+    </Product>
+</Wix>

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



More information about the Pkg-shibboleth-devel mailing list