[shibboleth-sp2] 11/82: SSPCPP-689 Installer build: support for VC14
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:20 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 7b1c5d837317f21bf28aad3bfa40ab1618c7cf10
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Fri Dec 30 11:36:33 2016 +0000
SSPCPP-689 Installer build: support for VC14
https://issues.shibboleth.net/jira/browse/SSPCPP-689
This is primarily to do with supressing nsapi and all the
apache plugins prior to 2.4.
Also collect the correct merge module.
---
msi/WiX/Installer.make | 35 ++++++++++++++++++++-----------
msi/WiX/ShibbolethSP-defs-x86.wxi | 8 +++++--
msi/WiX/ShibbolethSP-exe-x64.wxs | 18 +++++++++-------
msi/WiX/ShibbolethSP-exe-x86.wxs | 28 ++++++++++++++++---------
msi/WiX/ShibbolethSP-main-x64.wxs | 44 ++++++++++++++++++---------------------
msi/WiX/ShibbolethSP-main-x86.wxs | 17 +++++++--------
6 files changed, 86 insertions(+), 64 deletions(-)
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 8329418..7d25db1 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -1,3 +1,14 @@
+!If "$(MsVCVersion)" == "vc14"
+APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
+APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
+!Else
+APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so \
+ ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
+APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_13.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
+ ..\..\Build\$(MsVCVersion)\Release\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_13.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
+NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Debug\nsapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
+!Endif
+
all: all32 all64
all32: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi
@@ -35,29 +46,29 @@ Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj Shibbo
#
# Individual files
#
-ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so ..\..\Build\$(MsVCVer [...]
+ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\x64\Release\plugins.so ..\..\Build\$(MsVCVersion) [...]
wixcop -indent:2 ShibbolethSP-exe-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs
ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
wixcop -indent:2 ShibbolethSP-registry-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs
ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_install_isapi_filter.vbs-wix ..\scripts\shib_uninstall_isapi_filter.vbs-wix ..\scripts\shib_edit_config_files.vbs-wix
wixcop -indent:2 ShibbolethSP-noarch.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
-ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_13.so .. [...]
+ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Build\$(MsVCVersion)\Release\plugins-lite.so ..\..\ [...]
wixcop -indent:2 ShibbolethSP-exe-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs
ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
wixcop -indent:2 ShibbolethSP-registry-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs
ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
wixcop -indent:2 ShibbolethSP-gui.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs
ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
wixcop -indent:2 ShibbolethSP-update-dlg.wxs
@@ -67,10 +78,10 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
wixcop -indent:2 ShibbolethSP-install-dlg.wxs
candle ShibbolethSP-install-dlg.wxs
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm MergeModules\Log4Shib-x64 [...]
+ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm [...]
wixcop -indent:2 ShibbolethSP-main-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
+ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
wixcop -indent:2 ShibbolethSP-main-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dSPMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 0d6d076..d8f2840 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -49,11 +49,13 @@
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
<ComponentRef Id="isapi_shib.dll" />
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="mod_shib_13.so" />
<ComponentRef Id="mod_shib_20.so" />
<ComponentRef Id="mod_shib_22.so" />
- <ComponentRef Id="mod_shib_24.so" />
<ComponentRef Id="nsapi_shib.dll" />
+ <?endif?>
+ <ComponentRef Id="mod_shib_24.so" />
<ComponentRef Id="odbc_store.so" />
<ComponentRef Id="plugins.so" />
<ComponentRef Id="plugins_lite.so" />
@@ -63,11 +65,13 @@
<ComponentRef Id="adfs.so_debug" />
<ComponentRef Id="adfs_lite.so_debug" />
<ComponentRef Id="isapi_shib.dll_debug" />
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="mod_shib_13.so_debug" />
<ComponentRef Id="mod_shib_20.so_debug" />
<ComponentRef Id="mod_shib_22.so_debug" />
- <ComponentRef Id="mod_shib_24.so_debug" />
<ComponentRef Id="nsapi_shib.dll_debug" />
+ <?endif?>
+ <ComponentRef Id="mod_shib_24.so_debug" />
<ComponentRef Id="odbc_store.so_debug" />
<ComponentRef Id="plugins.so_debug" />
<ComponentRef Id="plugins_lite.so_debug" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index f58aee2..d571ff3 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -21,14 +21,14 @@
<Fragment>
<!-- Configuration, licenses and documentation -->
<DirectoryRef Id='INSTALLDIR'>
- <Directory Id='bin64' Name='bin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Release' >
+ <Directory Id='bin64' Name='bin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release'>
<Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe' Name='resolvertest.exe' />
</Component>
<Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />
</Component>
- <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Debug' >
+ <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug'>
<Component Id='resolvertest64.exe_debug' Guid='{58C98426-8C96-41EE-B956-A6BBAEAE5A10}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe_debug' Name='resolvertest.exe' />
</Component>
@@ -37,8 +37,8 @@
</Component>
</Directory><!-- bin_debug -->
</Directory><!-- bin -->
- <Directory Id='lib64' Name='lib64' >
- <Directory Id='lib64_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Release' >
+ <Directory Id='lib64' Name='lib64'>
+ <Directory Id='lib64_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release'>
<Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />
</Component>
@@ -48,9 +48,11 @@
<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>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_2264.so' Guid='{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so' Name='mod_shib_22.so' />
</Component>
+ <?endif ?>
<Component Id='mod_shib_2464.so' Guid='{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so' Name='mod_shib_24.so' />
</Component>
@@ -69,7 +71,7 @@
<Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />
</Component>
- <Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Debug' >
+ <Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug'>
<Component Id='adfs64.so_debug' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='adfs64.so_debug' Name='adfs.so' />
</Component>
@@ -79,9 +81,11 @@
<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>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_2264.so_debug' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so_debug' Name='mod_shib_22.so' />
</Component>
+ <?endif ?>
<Component Id='mod_shib_2464.so_debug' Guid='{38EE87FE-EA2B-41B4-A457-38A8F84B9866}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so_debug' Name='mod_shib_24.so' />
</Component>
@@ -104,11 +108,11 @@
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
- <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Release' >
+ <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release'>
<Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />
</Component>
- <Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Debug' >
+ <Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug'>
<Component Id='shibd64.exe_debug' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibd64.exe_debug' Name='shibd.exe' />
</Component>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index cd42a91..f9457ea 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -21,14 +21,14 @@
<Fragment>
<!-- Configuration, licenses and documentation -->
<DirectoryRef Id='INSTALLDIR'>
- <Directory Id='bin' Name='bin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Release' >
+ <Directory Id='bin' Name='bin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release'>
<Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>
<File KeyPath='yes' Checksum='yes' Name='resolvertest.exe' />
</Component>
<Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>
<File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />
</Component>
- <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Debug' >
+ <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug'>
<Component Id='resolvertest.exe_debug' Guid='{4FA03A33-961A-42E5-8D7A-5F2E207757DD}'>
<File KeyPath='yes' Checksum='yes' Id='resolvertest.exe_debug' Name='resolvertest.exe' />
</Component>
@@ -37,8 +37,8 @@
</Component>
</Directory><!-- bin_debug -->
</Directory><!-- bin -->
- <Directory Id='lib' Name='lib' >
- <Directory Id='lib_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Release' >
+ <Directory Id='lib' Name='lib'>
+ <Directory Id='lib_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release'>
<Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>
<File KeyPath='yes' Checksum='yes' Name='adfs.so' />
</Component>
@@ -48,6 +48,7 @@
<Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
<File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />
</Component>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_13.so' />
</Component>
@@ -57,12 +58,15 @@
<Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />
</Component>
+ <?endif ?>
<Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />
</Component>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
<File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />
</Component>
+ <?endif ?>
<Component Id='odbc_store.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
<File KeyPath='yes' Checksum='yes' Name='odbc-store.so' />
</Component>
@@ -78,7 +82,7 @@
<Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>
<File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />
</Component>
- <Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Debug' >
+ <Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug'>
<Component Id='adfs.so_debug' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
<File KeyPath='yes' Checksum='yes' Id='adfs.so_debug' Name='adfs.so' />
</Component>
@@ -88,6 +92,7 @@
<Component Id='isapi_shib.dll_debug' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>
<File KeyPath='yes' Checksum='yes' Id='isapi_shib.dll_debug' Name='isapi_shib.dll' />
</Component>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_13.so_debug' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_13.so_debug' Name='mod_shib_13.so' />
</Component>
@@ -97,12 +102,15 @@
<Component Id='mod_shib_22.so_debug' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_22.so_debug' Name='mod_shib_22.so' />
</Component>
+ <?endif?>
<Component Id='mod_shib_24.so_debug' Guid='{E04003DF-8C61-4C9E-87AB-89223C5E65DC}'>
- <File KeyPath='yes' Checksum='yes' Id='mod_shib_24.so_debug' Name='mod_shib_24.so'/>
+ <File KeyPath='yes' Checksum='yes' Id='mod_shib_24.so_debug' Name='mod_shib_24.so' />
</Component>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='nsapi_shib.dll_debug' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>
<File KeyPath='yes' Checksum='yes' Id='nsapi_shib.dll_debug' Name='nsapi_shib.dll' />
</Component>
+ <?endif?>
<Component Id='odbc_store.so_debug' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
<File KeyPath='yes' Checksum='yes' Id='odbc_store.so_debug' Name='odbc-store.so' />
</Component>
@@ -122,19 +130,19 @@
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
- <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Release' >
+ <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release'>
<Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
<File KeyPath='yes' Checksum='yes' Name='shibd.exe' />
<!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
- <ServiceInstall Id='shibd' Name='shibd_Default'
+ <ServiceInstall Id='shibd' Name='shibd_Default'
DisplayName='Shibboleth 2 Daemon (Default)'
Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
Type='ownProcess' Start='auto' ErrorControl='ignore' />
- <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
+ <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
Remove='uninstall' Start='install' Wait='no' />
</Component>
- <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Debug' >
+ <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug'>
<Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
<File KeyPath='yes' Checksum='yes' Id='shibd.exe_debug' Name='shibd.exe' />
</Component>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index d0b315a..1ac3a72 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -17,14 +17,14 @@
permissions and limitations under the License. -->
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Id='$(var.ShibbolethId64)' Language='1033'
- Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider'
+ <Product Id='$(var.ShibbolethId64)' Language='1033'
+ Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider'
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
<Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
Manufacturer='Shibboleth Consortium' InstallerVersion='301' Platform='x64'/>
<MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
- MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes' />
+ MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes' />
<PropertyRef Id='SHIB_OLDVERSION_64'/>
<PropertyRef Id='SHIB_OLDVERSION'/>
@@ -63,11 +63,8 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
-
- <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_VC100_CRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Directory Id='ProgramFiles64Folder' Name='PFiles'>
@@ -81,21 +78,16 @@
<Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />
-
- <Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm' DiskId='1' />
- <Merge Id='Microsoft_VC100_CRT_x64' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x64.msm' DiskId='1' />
</Directory><!--ProgramFiles64Folder-->
<!-- PATH -->
<Component Id='SetPath64' Guid='{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}' Win64='yes'>
- <Environment Id='SetPath64' Name='PATH' Action='set' Part='last' System='yes'
- Value='[ProgramFiles64Folder]Shibboleth\SP\lib' />
+ <Environment Id='SetPath64' Name='PATH' Action='set' Part='last' System='yes' Value='[ProgramFiles64Folder]Shibboleth\SP\lib' />
</Component>
<Component Id='SetPath' Guid='{0E8BD571-3A26-4F61-979E-B5807A28634A}'>
- <Environment Id='SetPath' Name='PATH' Action='set' Part='last' System='yes'
- Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
+ <Environment Id='SetPath' Name='PATH' Action='set' Part='last' System='yes' Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
</Component>
</Directory><!--TARGETDIR-->
@@ -121,8 +113,8 @@
<MergeRef Id='XmlSecMergeModule_x86'/>
<MergeRef Id='ZlibMergeModule_x86'/>
- <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
- <MergeRef Id='Microsoft_VC100_CRT_x86' />
+ <MergeRef Id='Microsoft_DebugCRT_x86'/>
+ <MergeRef Id='Microsoft_CRT_x86'/>
<MergeRef Id='CurlMergeModule_x64'/>
<MergeRef Id='FastCGIMergeModule_x64'/>
@@ -134,20 +126,22 @@
<MergeRef Id='XmlSecMergeModule_x64'/>
<MergeRef Id='ZlibMergeModule_x64'/>
- <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>
- <MergeRef Id='Microsoft_VC100_CRT_x64' />
+ <MergeRef Id='Microsoft_DebugCRT_x64'/>
+ <MergeRef Id='Microsoft_CRT_x64'/>
<!-- ShibbolethSP-exe-x64-->
<ComponentRef Id='resolvertest64.exe'/>
<ComponentRef Id='mdquery64.exe'/>
<ComponentRef Id='resolvertest64.exe_debug'/>
- <ComponentRef Id='mdquery64.exe_debug' />
+ <ComponentRef Id='mdquery64.exe_debug'/>
<ComponentRef Id='adfs64.so'/>
<ComponentRef Id='adfs_lite64.so'/>
<ComponentRef Id='isapi_shib64.dll'/>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id='mod_shib_2264.so'/>
+ <?endif?>
<ComponentRef Id='mod_shib_2464.so'/>
<ComponentRef Id='odbc_store64.so'/>
<ComponentRef Id='plugins64.so'/>
@@ -158,7 +152,9 @@
<ComponentRef Id='adfs64.so_debug'/>
<ComponentRef Id='adfs_lite64.so_debug'/>
<ComponentRef Id='isapi_shib64.dll_debug'/>
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id='mod_shib_2264.so_debug'/>
+ <?endif?>
<ComponentRef Id='mod_shib_2464.so_debug'/>
<ComponentRef Id='odbc_store64.so_debug'/>
<ComponentRef Id='plugins64.so_debug'/>
@@ -174,7 +170,7 @@
<ComponentRef Id='InstallIsapi64'/>
<ComponentRef Id='Install32Bit64'/>
<ComponentRef Id='file_extension64'/>
- <ComponentRef Id='shib64.ico' />
+ <ComponentRef Id='shib64.ico'/>
<!-- ShibbolethSP-main-x64 -->
<ComponentRef Id='SetPath'/>
@@ -189,7 +185,7 @@
others are shared with x86
-->
<Component Id='messageFile' Guid='{3FF89632-9F39-4B1B-AA3E-3AF6C8155B92}' Win64='yes' Directory='bin64'>
- <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Release\Messages.dll'/>
+ <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\Messages.dll'/>
<RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
<RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
<RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 49fea69..24d2bf6 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -17,7 +17,7 @@
permissions and limitations under the License. -->
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Id='$(var.ShibbolethId32)' Language='1033'
+ <Product Id='$(var.ShibbolethId32)' Language='1033'
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider'
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
<Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
@@ -64,11 +64,10 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
-
- <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_VC100_CRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033'
+ SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033'
+ SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Component Id='SetPath' Guid='{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}'>
@@ -91,8 +90,8 @@
<MergeRef Id='XmlSecMergeModule_x86'/>
<MergeRef Id='ZlibMergeModule_x86'/>
- <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
- <MergeRef Id='Microsoft_VC100_CRT_x86' />
+ <MergeRef Id='Microsoft_DebugCRT_x86'/>
+ <MergeRef Id='Microsoft_CRT_x86' />
<!-- ShibbolethSP-main-x86 -->
<ComponentRef Id='SetPath'/>
@@ -103,7 +102,7 @@
others are shared with x64
-->
<Component Id='messageFile' Guid='{7B81ACC5-B79C-426B-ACB8-346A52E5FF60}' Win64='no' Directory='bin'>
- <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Release\Messages.dll'/>
+ <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\Messages.dll'/>
<RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
<RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
<RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
--
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