[shibboleth-sp2] 47/82: SSPCPP-694 Fix mis-commit of installer work
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:24 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 f1de47c58b45268927536c5404c48c45ef5e20fa
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Sun Jul 16 16:38:26 2017 +0100
SSPCPP-694 Fix mis-commit of installer work
https://issues.shibboleth.net/jira/browse/SSPCPP-694
Remove duplicate IIsNatve.wxs and move the proper one to the mis\wix directory.
---
Projects/vc14/iis7_shib/IIsNatve.wxs | 106 -----------------------------------
msi/WiX/IIsNatve.wxs | 43 +++++++++-----
2 files changed, 30 insertions(+), 119 deletions(-)
diff --git a/Projects/vc14/iis7_shib/IIsNatve.wxs b/Projects/vc14/iis7_shib/IIsNatve.wxs
deleted file mode 100644
index 2b29fe5..0000000
--- a/Projects/vc14/iis7_shib/IIsNatve.wxs
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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/msi/WiX/IIsNatve.wxs b/msi/WiX/IIsNatve.wxs
index 8bb20c5..2b29fe5 100644
--- a/msi/WiX/IIsNatve.wxs
+++ b/msi/WiX/IIsNatve.wxs
@@ -7,7 +7,7 @@
<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'/>
+ <MediaTemplate EmbedCab="yes"/>
<Upgrade Id="$(var.ShibbolethUpgradeCode)">
<UpgradeVersion Property="FOUNDSHIB" Minimum="2.6.0.0" Maximum="2.7.0.0" OnlyDetect="yes"/>
@@ -20,19 +20,22 @@
<ComponentRef Id="iis7" />
<ComponentRef Id="iis7D"/>
<ComponentRef Id="native_sp_config.xsd"/>
- </Feature>
+ <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 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' />
+ <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>
@@ -41,19 +44,33 @@
</Directory>
</Directory>
- <DirectoryRef Id='INSTALLDIR'>
+ <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"
--
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