[cpp-sp] 01/06: CPPSP-28 Windows Installers for Sp4 Agents
Codeberg
noreply at shibboleth.net
Mon Jan 26 20:00:28 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository cpp-sp.
View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/4784c90c332ff49940282f54d815b2d41ad086e5
commit 4784c90c332ff49940282f54d815b2d41ad086e5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 26 13:43:22 2026 +0000
CPPSP-28 Windows Installers for Sp4 Agents
https://shibboleth.atlassian.net/browse/CPPSP-28
Move WiX sources up to the msi folder
---
msi/.gitignore | 1 +
msi/WiX/Dialog.bmp | Bin 472310 -> 0 bytes
msi/WiX/Installer.make | 99 ---------
msi/WiX/MergeModules/Curl-x64.wxs | 65 ------
msi/WiX/MergeModules/Curl-x86.wxs | 64 ------
msi/WiX/MergeModules/FastCGI-x64.wxs | 49 -----
msi/WiX/MergeModules/FastCGI-x86.wxs | 51 -----
msi/WiX/MergeModules/Log4Shib-x64.wxs | 57 ------
msi/WiX/MergeModules/Log4Shib-x86.wxs | 57 ------
msi/WiX/MergeModules/MergeModules.make | 298 ----------------------------
msi/WiX/MergeModules/OpenSAML-schemas.wxs | 251 -----------------------
msi/WiX/MergeModules/OpenSAML-x64.wxs | 77 -------
msi/WiX/MergeModules/OpenSAML-x86.wxs | 77 -------
msi/WiX/MergeModules/OpenSSL-x64.wxs | 82 --------
msi/WiX/MergeModules/OpenSSL-x86.wxs | 83 --------
msi/WiX/MergeModules/Shibboleth-schemas.wxs | 103 ----------
msi/WiX/MergeModules/Shibboleth-x64.wxs | 61 ------
msi/WiX/MergeModules/Shibboleth-x86.wxs | 59 ------
msi/WiX/MergeModules/Xerces-x64.wxs | 50 -----
msi/WiX/MergeModules/Xerces-x86.wxs | 50 -----
msi/WiX/MergeModules/XmlSec-x64.wxs | 98 ---------
msi/WiX/MergeModules/XmlSec-x86.wxs | 98 ---------
msi/WiX/MergeModules/Zlib-x64.wxs | 45 -----
msi/WiX/MergeModules/Zlib-x86.wxs | 45 -----
msi/WiX/Patch-x64.wxs | 38 ----
msi/WiX/Patch-x86.wxs | 38 ----
msi/WiX/ShibbolethSP-defs-x86.wxi | 94 ---------
msi/WiX/ShibbolethSP-exe-x64.wxs | 160 ---------------
msi/WiX/ShibbolethSP-exe-x86.wxs | 172 ----------------
msi/WiX/ShibbolethSP-gui.wxs | 122 ------------
msi/WiX/ShibbolethSP-install-dlg.wxs | 87 --------
msi/WiX/ShibbolethSP-main-x64.wxs | 261 ------------------------
msi/WiX/ShibbolethSP-main-x86.wxs | 153 --------------
msi/WiX/ShibbolethSP-noarch.wxs | 253 -----------------------
msi/WiX/ShibbolethSP-properties.wxi | 48 -----
msi/WiX/ShibbolethSP-registry-x64.wxs | 65 ------
msi/WiX/ShibbolethSP-registry-x86.wxs | 64 ------
msi/WiX/ShibbolethSP-update-dlg.wxs | 50 -----
msi/WiX/TopBanner.bmp | Bin 94556 -> 0 bytes
msi/WiX/license.rtf | 38 ----
msi/{wix6 => }/installer.vcxproj | 0
msi/{wix6 => }/nuget.config | 0
msi/scripts/shib_edit_catalog.vbs | 54 -----
msi/scripts/shib_edit_config_files.vbs-wix | 209 -------------------
msi/{wix6 => }/sp4.wxs | 0
45 files changed, 1 insertion(+), 3825 deletions(-)
diff --git a/msi/.gitignore b/msi/.gitignore
new file mode 100644
index 00000000..08ab6675
--- /dev/null
+++ b/msi/.gitignore
@@ -0,0 +1 @@
+obj
\ No newline at end of file
diff --git a/msi/WiX/Dialog.bmp b/msi/WiX/Dialog.bmp
deleted file mode 100644
index 4d50f2e1..00000000
Binary files a/msi/WiX/Dialog.bmp and /dev/null differ
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
deleted file mode 100644
index c6209755..00000000
--- a/msi/WiX/Installer.make
+++ /dev/null
@@ -1,99 +0,0 @@
-!if "$(DEBUG_INSTALLER)" != ""
-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_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
- ..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
-NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Debug\nsapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
-!else
-APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
-
-APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
-NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
-!endif
-
-!If "$(MsVCVersion)" == "vc10"
-!Error MSVC 10 not supported
-!Endif
-
-!If "$(CppMmDir)" == ""
-CppMmDir=C:\Program Files (x86)\Common Files\Merge Modules
-!else
-!Endif
-
-all: all32 all64
-
-all32: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi
-
-all64: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi
-
-clean32:
- del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib
-
-clean64:
- del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib
-
-clean: clean32 clean64
-
-rebuild32: clean32 all32
-
-rebuild64: clean64 all64
-
-#
-# MSI
-#
-shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib
- light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
- del shibboleth-sp-$(ShibbolethVersion)-win64.msi
-
-shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib
- light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
-
-#
-# Library
-#
-Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
- lit -pedantic -out Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
-
-#
-# 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\iis7_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersi [...]
- wixcop -indent:2 ShibbolethSP-exe-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs -dFCGI="$(FCGI_AUTH_RESP64)" -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
- wixcop -indent:2 ShibbolethSP-registry-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_edit_config_files.vbs-wix
- wixcop -indent:2 ShibbolethSP-noarch.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs -dBuildDebug=$(DebugInstaller)
-
-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\iis7_shib.dll ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Bu [...]
- wixcop -indent:2 ShibbolethSP-exe-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs -dNSApi="$(NSAPI_DLLS)" -dFCGI="$(FCGI_AUTH_RESP86)" -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
- wixcop -indent:2 ShibbolethSP-registry-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
- wixcop -indent:2 ShibbolethSP-gui.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
- wixcop -indent:2 ShibbolethSP-update-dlg.wxs
- candle ShibbolethSP-update-dlg.wxs -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
- wixcop -indent:2 ShibbolethSP-install-dlg.wxs
- candle ShibbolethSP-install-dlg.wxs -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) 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 $(FCGI64) MergeModules\Log4Shib-x64.msm MergeMo [...]
- wixcop -indent:2 ShibbolethSP-main-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
-
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) 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) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
deleted file mode 100644
index 679942f1..00000000
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
-<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="CurlMergeModule_x64" Language="1033" Version="$(var.CurlVersion)">
- <Package Id="{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}" Description="Merge Module for CURL (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="libcurl5.dll" Guid="$(var.LibCurlGuid64)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseLibDir)\libcurl$(var.CurlFileVersion).pdb" />
- </Component>
- <Component Id="curl.exe" Guid="{52103377-AEF6-4533-B0CE-D3A786D2D17E}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid64d)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugLibDir)\libcurl$(var.CurlFileVersion)d.pdb" />
- </Component>
- <Component Id="curl.exe_debug" Guid="{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}" Win64="yes">
- <File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="CURL.LICENSE" Guid="{838175A6-8CC3-45D3-9A5E-C4C4147076E9}" Win64="yes">
- <File KeyPath="yes" Name="CURL.LICENSE" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
deleted file mode 100644
index ec4de57c..00000000
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
-<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="CurlMergeModule_x86" Language="1033" Version="$(var.CurlVersion)">
- <Package Id="10467105-6375-49E1-AC35-045084BD8FA4" Description="Merge Module for CURL (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="libcurl5.dll" Guid="$(var.LibCurlGuid32)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseLibDir)\libcurl$(var.CurlFileVersion).pdb" />
- </Component>
- <Component Id="curl.exe" Guid="{67A6F011-9715-43C2-92F1-70FE53E935AD}">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid32d)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugLibDir)\libcurl$(var.CurlFileVersion)d.pdb" />
- </Component>
- <Component Id="curl.exe_debug" Guid="{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}">
- <File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="CURL.LICENSE" Guid="{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}">
- <File KeyPath="yes" Name="CURL.LICENSE" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
deleted file mode 100644
index d6995ed0..00000000
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="FastCGIMergeModule_x64" Language="1033" Version="$(var.FastCGIVersion)">
- <Package Id="{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}" Description="Merge Module for FastCGI (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="libfcgi.dll" Guid="{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Release\libfcgi.dll" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="libfcgid.dll" Guid="{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Debug\libfcgid.dll" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="FASTCGI.LICENSE" Guid="{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}" Win64="yes">
- <File KeyPath="yes" Name="FASTCGI.LICENSE" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\LICENSE.TERMS" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
deleted file mode 100644
index fc6ca7af..00000000
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="FastCGIMergeModule_x86" Language="1033" Version="$(var.FastCGIVersion)">
- <Package Id="{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}" Description="Merge Module for FastCGI (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="libfcgi.dll" Guid="{FD6F8E32-CBDF-4662-A39C-8EC713483C51}">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Release\libfcgi.dll" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="libfcgid.dll" Guid="{682FFA3A-D517-4332-BCC5-EF24252C3528}">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Debug\libfcgid.dll" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="FASTCGI.LICENSE" Guid="{3FB61369-D8A7-4076-B659-DEDA2558A1AF}">
- <File KeyPath="yes" Name="FASTCGI.LICENSE" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\LICENSE.TERMS" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
-
-
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
deleted file mode 100644
index 67873694..00000000
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="Log4ShibMergeModule_x86" Language="1033" Version="$(var.Log4ShibVersion)">
- <Package Id="{A2D51A0D-847A-4941-80FC-C8C8E697565F}" Description="Merge Module for Log4Shib (x64)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\x64\Release\">
- <Component Id="log4shib.dll" Guid="$(var.Log4ShibComponent64)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion).pdb" />
- </Component>
- <Component Id="NTEventLogAppender.dll" Guid="{1A559035-DCA4-4297-AE94-C3E6ABB37662}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\x64\Debug\">
- <Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent64d)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion)D.pdb" />
- </Component>
- <Component Id="NTEventLogAppender.dll_debug" Guid="{6C23C432-EA11-4313-9F5F-DBB09A8752E8}" Win64="yes">
- <File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="LOG4SHIB.LICENSE" Guid="{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}" Win64="yes">
- <File KeyPath="yes" Name="LOG4SHIB.LICENSE" Source="$(var.BuildDirectory)\$(var.log4shib)\COPYING" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
deleted file mode 100644
index ac2a5a31..00000000
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="Log4ShibMergeModule_x86" Language="1033" Version="$(var.Log4ShibVersion)">
- <Package Id="1AD64745-CA05-41AF-B5E9-A59AA4A1C134" Description="Merge Module for Log4Shib (x86)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\Release\">
- <Component Id="log4shib.dll" Guid="$(var.Log4ShibComponent32)">
- <File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion).pdb" />
- </Component>
- <Component Id="NTEventLogAppender.dll" Guid="{43B944CB-E42A-4D17-A601-AC4E14DA2217}">
- <File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\Debug\">
- <Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent32d)">
- <File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion)D.pdb" />
- </Component>
- <Component Id="NTEventLogAppender.dll_debug" Guid="{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}">
- <File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="LOG4CPP.LICENSE" Guid="{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}">
- <File KeyPath="yes" Name="LOG4SHIB.LICENSE" Source="$(var.BuildDirectory)\$(var.log4shib)\COPYING" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
deleted file mode 100644
index 36e34f86..00000000
--- a/msi/WiX/MergeModules/MergeModules.make
+++ /dev/null
@@ -1,298 +0,0 @@
-all: all32 all64
-
-all32: Curl-x86.msm Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm\
- OpenSSL-x86.msm Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm\
- XmlSec-x86.msm Zlib-x86.msm
-
-all64: Curl-x64.msm Log4shib-x64.msm OpenSAML-x64.msm OpenSAML-schemas.msm\
- OpenSSL-x64.msm Shibboleth-x64.msm Shibboleth-schemas.msm Xerces-x64.msm\
- XmlSec-x64.msm Zlib-x64.msm
-
-clean32:
- del *-x86.msm *-x86.wixobj *-x86.wixpdb *schemas.wixobj *schemas.msm
-
-clean64:
- del *-x64.wixobj *-x64.msm *-x64.wixpdb *schemas.wixobj *schemas.msm
-
-clean: clean32 clean64
-
-rebuild32: clean32 all32
-
-rebuild64: clean64 all64
-
-#
-# CURL
-#
-Curl-x64.msm: Curl-x64.wixobj
- light Curl-x64.wixobj
- del ..\*64*.msi
-
-Curl-x64.wixobj: Curl-x64.wxs
- wixcop -indent:2 Curl-x64.wxs
- candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
- -dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
- -dLibCurlGuid64=$(LibCurlGuid64) -dLibCurlGuid64d=$(LibCurlGuid64d)\
- -dBuildDebug=$(DebugInstaller)
-
-Curl-x86.msm: Curl-x86.wixobj
- light Curl-x86.wixobj
- del ..\*32*.msi
-
-Curl-x86.wixobj: Curl-x86.wxs
- wixcop -indent:2 Curl-x86.wxs
- candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
- -dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
- -dLibCurlGuid32=$(LibCurlGuid32) -dLibCurlGuid32d=$(LibCurlGuid32d)\
- -dBuildDebug=$(DebugInstaller)
-
-#
-# FastCGI
-#
-FastCGI-x86.msm: FastCGI-x86.wixobj
- light FastCGI-x86.wixobj
-
-FastCGI-x86.wixobj: FastCGI-x86.wxs\
- $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll
- wixcop -indent:2 FastCGI-x86.wxs
- candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
- -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
-
-FastCGI-x64.msm: FastCGI-x64.wixobj
- light FastCGI-x64.wixobj
-
-
-FastCGI-x64.wixobj: FastCGI-x64.wxs\
- $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Release\libfcgi.dll
- wixcop -indent:2 FastCGI-x64.wxs
- candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
- -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
-
-#
-# Log4shib. More complicated since it has a version and a file version (and hence 2 components per architecture)
-#
-Log4Shib-x64.msm: Log4Shib-x64.wixobj
- light Log4Shib-x64.wixobj
- del ..\*64*.msi
-
-Log4Shib-x86.msm: Log4Shib-x86.wixobj
- light Log4Shib-x86.wixobj
- del ..\*32*.msi
-
-Log4Shib-x86.wixobj: Log4Shib-x86.wxs\
- $(BuildSP)\$(log4shib)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
- wixcop -indent:2 Log4Shib-x86.wxs
- candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dlog4shib=$(log4shib)\
- -dLog4ShibFileVersion=$(Log4ShibFileVersion)\
- -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\
- -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
-
-Log4Shib-x64.wixobj: Log4Shib-x64.wxs\
- $(BuildSP)\$(log4shib)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
- wixcop -indent:2 Log4Shib-x64.wxs
- candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion)\
- -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dlog4shib=$(log4shib)\
- -dLog4ShibComponent64=$(Log4ShibComponent64) -dBuildDebug=$(DebugInstaller)\
- -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
-
-#
-# OpenSAML
-#
-OpenSAML-x86.msm: OpenSAML-x86.wixobj
- light OpenSAML-x86.wixobj
- del ..\*32*.msi
-
-OpenSAML-x64.msm: OpenSAML-x64.wixobj
- light OpenSAML-x64.wixobj
- del ..\*64*.msi
-
-OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll
- wixcop -indent:2 OpenSAML-x86.wxs
- candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
- -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32)\
- -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32)\
- -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) \
- -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbolethMsVersion=$(MsVCVersion)\
- -dBuildDebug=$(DebugInstaller)
-
-OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Release\saml$(OpenSAMLFileVersion).dll
- wixcop -indent:2 OpenSAML-x64.wxs
- candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
- -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64)\
- -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64)\
- -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d)\
- -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibbolethMsVersion=$(MsVCVersion)\
- -dBuildDebug=$(DebugInstaller)
-
-OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
- light OpenSAML-schemas.wixobj
- del ..\*.msi
-
-OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs
- wixcop -indent:2 OpenSAML-schemas.wxs
- candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion)
-
-#
-# OpenSSL
-#
-OpenSSL-x86.msm: OpenSSL-x86.wixobj
- light OpenSSL-x86.wixobj
- del ..\*32*.msi
-
-OpenSSL-x64.msm: OpenSSL-x64.wixobj
- light OpenSSL-x64.wixobj
- del ..\*64*.msi
-
-OpenSSL-x86.wixobj: OpenSSL-x86.wxs
- wixcop -indent:2 OpenSSL-x86.wxs
- candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
- -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component)\
- -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dopenssl=$(openssl)\
- -dBuildDebug=$(DebugInstaller)
-
-OpenSSL-x64.wixobj: OpenSSL-x64.wxs
- wixcop -indent:2 OpenSSL-x64.wxs
- candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
- -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component)\
- -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd)\
- -dSSlEay64Componentd=$(SSlEay64Componentd) -dopenssl=$(openssl)\
- -dBuildDebug=$(DebugInstaller)
-
-#
-# Shibboleth DLL
-#
-Shibboleth-x86.msm: Shibboleth-x86.wixobj
- light Shibboleth-x86.wixobj
- del ..\*32*.msi
-
-Shibboleth-x64.msm: Shibboleth-x64.wixobj
- light Shibboleth-x64.wixobj
- del ..\*64*.msi
-
-Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll
- wixcop -indent:2 Shibboleth-x86.wxs
- candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
- -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component)\
- -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd)\
- -dShibDllLite32Componentd=$(ShibDllLite32Componentd) -dBuildDebug=$(DebugInstaller)
-
-Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll
- wixcop -indent:2 Shibboleth-x64.wxs
- candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
- -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component)\
- -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd)\
- -dShibDllLite64Componentd=$(ShibDllLite64Componentd) -dBuildDebug=$(DebugInstaller)
-
-Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
- light Shibboleth-schemas.wixobj
-
-Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs
- wixcop -indent:2 Shibboleth-schemas.wxs
- candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion)
-
-
-#
-# Xerces
-#
-Xerces-x86.msm: Xerces-x86.wixobj
- light Xerces-x86.wixobj
- del ..\*32*.msi
-
-Xerces-x64.msm: Xerces-x64.wixobj
- light Xerces-x64.wixobj
- del ..\*64*.msi
-
-XercesDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
-XercesDebugDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
-
-XercesPdb32=$(BuildSP)\$(Xerces)\Buildx86\src\Release\xerces-c_$(XercesFileVersion).pdb
-XercesDebugPdb32=$(BuildSP)\$(Xerces)\Buildx86\src\Debug\xerces-c_$(XercesFileVersion)D.pdb
-
-Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs
- wixcop -indent:2 Xerces-x86.wxs
- candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll32) -dXercesDebugDll=$(XercesDebugDll32) \
- -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) \
- -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\
- -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)\
- -dXercesDebugPdb=$(XercesDebugPdb32) -dXercesPdb=$(XercesPdb32)
-
-XercesDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
-XercesDebugDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
-
-XercesPdb64=$(BuildSP)\$(Xerces)\Buildx64\src\Release\xerces-c_$(XercesFileVersion).pdb
-XercesDebugPdb64=$(BuildSP)\$(Xerces)\Buildx64\src\Debug\xerces-c_$(XercesFileVersion)D.pdb
-
-Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs
- wixcop -indent:2 Xerces-x64.wxs
- candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll64) -dXercesDebugDll=$(XercesDebugDll64) \
- -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) \
- -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\
- -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)\
- -dXercesDebugPdb=$(XercesDebugPdb64) -dXercesPdb=$(XercesPdb64)
-
-
-#
-# XmlSec
-#
-XmlSec-x86.msm: XmlSec-x86.wixobj
- light XmlSec-x86.wixobj
- del ..\*32*.msi
-
-XmlSec-x64.msm: XmlSec-x64.wixobj
- light XmlSec-x64.wixobj
- del ..\*64*.msi
-
-XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\xsec_$(XmlSecFileVersion).dll"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\c14n.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\checksig.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\cipher.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\siginf.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\txfmout.exe"
- wixcop -indent:2 XmlSec-x86.wxs
- candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
- -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
- -dBuildDebug=$(DebugInstaller)
-
-XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\xsec_$(XmlSecFileVersion).dll"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\c14n.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\checksig.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\cipher.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\siginf.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\txfmout.exe"
- wixcop -indent:2 XmlSec-x64.wxs
- candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
- -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
- -dBuildDebug=$(DebugInstaller)
-
-#
-# ZLIB
-#
-
-zlib-x86.msm: zlib-x86.wixobj
- light zlib-x86.wixobj
- del ..\*32*.msi
-
-zlib-x64.msm: zlib-x64.wixobj
- light zlib-x64.wixobj
- del ..\*64*.msi
-
-zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\$(zlib)\Release\zlib$(ZlibFileVersion).dll
- wixcop -indent:2 zlib-x86.wxs
- candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
- -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd) -dzlib=$(zlib)\
- -dBuildDebug=$(DebugInstaller)
-
-zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\$(zlib)\x64\Release\zlib$(ZlibFileVersion).dll
- wixcop -indent:2 zlib-x64.wxs
- candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
- -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd) -dzlib=$(zlib)\
- -dBuildDebug=$(DebugInstaller)
-
-#
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
deleted file mode 100644
index 645c54e8..00000000
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-
- <Module Id="OpenSAMLSchemasMergeModule" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{8567178A-EEA1-4798-9D20-C2E2F7247D0F}" Description="Merge Module for OpenSAML schemas" Comments="This module is built by the Shibboleth Consortium" Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="CommonAppDataFolder" Name="CommonFiles">
- <Directory Id="Shibboleth" Name="Shibboleth">
- <Directory Id="SP" Name="SP">
- <Directory Id="xml" Name="xml">
- <Directory Id="opensaml" Name="opensaml" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\schemas\">
- <Component Id="assertion_01.xsd" Guid="{3BB83A55-9212-40F4-86E1-D95CEDAE5501}">
- <File KeyPath="yes" Id="assertion_01.xsd" Name="cs-sstc-schema-assertion-01.xsd" />
- </Component>
- <Component Id="assertion_1.1.xsd" Guid="{D01E45CD-41D8-4029-AB27-103D36734D07}">
- <File KeyPath="yes" Id="assertion_1.1.xsd" Name="cs-sstc-schema-assertion-1.1.xsd" />
- </Component>
- <Component Id="protocol_01.xsd" Guid="{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}">
- <File KeyPath="yes" Id="protocol_01.xsd" Name="cs-sstc-schema-protocol-01.xsd" />
- </Component>
- <Component Id="protocol_1.1.xsd" Guid="{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}">
- <File KeyPath="yes" Id="protocol_1.1.xsd" Name="cs-sstc-schema-protocol-1.1.xsd" />
- </Component>
- <Component Id="saml10_catalog.xml" Guid="{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}">
- <File KeyPath="yes" Name="saml10-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in" />
- </Component>
- <Component Id="saml10_catalog.xml.in" Guid="{A39E0CB9-2E80-4205-82F7-6A66E50D3B6E}">
- <File KeyPath="yes" Name="saml10-catalog.xml.in" />
- </Component>
- <Component Id="saml11_catalog.xml" Guid="{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}">
- <File KeyPath="yes" Name="saml11-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in" />
- </Component>
- <Component Id="saml11_catalog.xml.in" Guid="{B804D093-7608-4D18-BEAE-C0FC65A43AB3}">
- <File KeyPath="yes" Name="saml11-catalog.xml.in" />
- </Component>
- <Component Id="saml20_catalog.xml" Guid="{2A9829FE-518F-478B-B116-5B6A3087A6C9}">
- <File KeyPath="yes" Name="saml20-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in" />
- </Component>
- <Component Id="saml20_catalog.xml.in" Guid="{EBFD82A6-8B4F-44F1-8304-254904E7E432}">
- <File KeyPath="yes" Name="saml20-catalog.xml.in" />
- </Component>
- <Component Id="assertion_2.0.xsd" Guid="{6A785715-2E2E-4DFC-948B-94711E1DC355}">
- <File KeyPath="yes" Id="assertion_2.0.xsd" Name="saml-schema-assertion-2.0.xsd" />
- </Component>
- <Component Id="authn_context_2.0.xsd" Guid="{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}">
- <File KeyPath="yes" Id="authn_context_2.0.xsd" Name="saml-schema-authn-context-2.0.xsd" />
- </Component>
- <Component Id="ac_auth_telephony_2.0.xsd" Guid="{81BDD012-6863-45DF-86CB-138B627D7D17}">
- <File KeyPath="yes" Id="ac_auth_telephony_2.0.xsd" Name="saml-schema-authn-context-auth-telephony-2.0.xsd" />
- </Component>
- <Component Id="ac_ip_2.0.xsd" Guid="{A47F07CA-77B4-40E5-A8FA-955C626E6E38}">
- <File KeyPath="yes" Id="ac_ip_2.0.xsd" Name="saml-schema-authn-context-ip-2.0.xsd" />
- </Component>
- <Component Id="ac_ippword_2.0.xsd" Guid="{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}">
- <File KeyPath="yes" Id="ac_ippword_2.0.xsd" Name="saml-schema-authn-context-ippword-2.0.xsd" />
- </Component>
- <Component Id="ac_kerberos_2.0.xsd" Guid="{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}">
- <File KeyPath="yes" Id="ac_kerberos_2.0.xsd" Name="saml-schema-authn-context-kerberos-2.0.xsd" />
- </Component>
- <Component Id="ac_mobileonefactor_reg_2.0.xsd" Guid="{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}">
- <File KeyPath="yes" Id="ac_mobileonefactor_reg_2.0.xsd" Name="saml-schema-authn-context-mobileonefactor-reg-2.0.xsd" />
- </Component>
- <Component Id="ac_mobileonefactor_unreg_2.0.xsd" Guid="{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}">
- <File KeyPath="yes" Id="ac_mobileonefactor_unreg_2.0.xsd" Name="saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd" />
- </Component>
- <Component Id="ac_mobiletwofactor_reg_2.0.xsd" Guid="{70C79D92-D7AF-49FB-A332-72F431582C6A}">
- <File KeyPath="yes" Id="ac_mobiletwofactor_reg_2.0.xsd" Name="saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd" />
- </Component>
- <Component Id="ac_mobiletwofactor_unreg_2.0.xsd" Guid="{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}">
- <File KeyPath="yes" Id="ac_mobiletwofactor_unreg_2.0.xsd" Name="saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd" />
- </Component>
- <Component Id="ac_nomad_telephony_2.0.xsd" Guid="{13686CA3-58F4-4176-9297-3E797D075A6E}">
- <File KeyPath="yes" Id="ac_nomad_telephony_2.0.xsd" Name="saml-schema-authn-context-nomad-telephony-2.0.xsd" />
- </Component>
- <Component Id="ac_personal_telephony_2.0.xsd" Guid="{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}">
- <File KeyPath="yes" Id="ac_personal_telephony_2.0.xsd" Name="saml-schema-authn-context-personal-telephony-2.0.xsd" />
- </Component>
- <Component Id="ac_pgp_2.0.xsd" Guid="{4514C6C6-0DFB-4A4B-BD93-36D856937199}">
- <File KeyPath="yes" Id="ac_pgp_2.0.xsd" Name="saml-schema-authn-context-pgp-2.0.xsd" />
- </Component>
- <Component Id="ac_ppt_2.0.xsd" Guid="{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}">
- <File KeyPath="yes" Id="ac_ppt_2.0.xsd" Name="saml-schema-authn-context-ppt-2.0.xsd" />
- </Component>
- <Component Id="ac_pword_2.0.xsd" Guid="{77793E85-3003-4D75-862E-7164AB576D6D}">
- <File KeyPath="yes" Id="ac_pword_2.0.xsd" Name="saml-schema-authn-context-pword-2.0.xsd" />
- </Component>
- <Component Id="ac_session_2.0.xsd" Guid="{D426514A-1A01-4B70-9375-C5240E9267FB}">
- <File KeyPath="yes" Id="ac_session_2.0.xsd" Name="saml-schema-authn-context-session-2.0.xsd" />
- </Component>
- <Component Id="ac_smartcard_2.0.xsd" Guid="{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}">
- <File KeyPath="yes" Id="ac_smartcard_2.0.xsd" Name="saml-schema-authn-context-smartcard-2.0.xsd" />
- </Component>
- <Component Id="ac_smartcardpki_2.0.xsd" Guid="{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}">
- <File KeyPath="yes" Id="ac_smartcardpki_2.0.xsd" Name="saml-schema-authn-context-smartcardpki-2.0.xsd" />
- </Component>
- <Component Id="ac_softwarepki_2.0.xsd" Guid="{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}">
- <File KeyPath="yes" Id="ac_softwarepki_2.0.xsd" Name="saml-schema-authn-context-softwarepki-2.0.xsd" />
- </Component>
- <Component Id="ac_spki_2.0.xsd" Guid="{76840C0F-8991-4B6D-A32F-6053B93B60B6}">
- <File KeyPath="yes" Id="ac_spki_2.0.xsd" Name="saml-schema-authn-context-spki-2.0.xsd" />
- </Component>
- <Component Id="ac_srp_2.0.xsd" Guid="{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}">
- <File KeyPath="yes" Id="ac_srp_2.0.xsd" Name="saml-schema-authn-context-srp-2.0.xsd" />
- </Component>
- <Component Id="ac_sslcert_2.0.xsd" Guid="{72BE1F0B-E2B5-40D3-A086-24D0011E718C}">
- <File KeyPath="yes" Id="ac_sslcert_2.0.xsd" Name="saml-schema-authn-context-sslcert-2.0.xsd" />
- </Component>
- <Component Id="ac_telephony_2.0.xsd" Guid="{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}">
- <File KeyPath="yes" Id="ac_telephony_2.0.xsd" Name="saml-schema-authn-context-telephony-2.0.xsd" />
- </Component>
- <Component Id="ac_timesync_2.0.xsd" Guid="{8220805B-A2D3-4952-BF20-AA763B77C243}">
- <File KeyPath="yes" Id="ac_timesync_2.0.xsd" Name="saml-schema-authn-context-timesync-2.0.xsd" />
- </Component>
- <Component Id="ac_types_2.0.xsd" Guid="{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}">
- <File KeyPath="yes" Id="ac_types_2.0.xsd" Name="saml-schema-authn-context-types-2.0.xsd" />
- </Component>
- <Component Id="ac_x509_2.0.xsd" Guid="{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}">
- <File KeyPath="yes" Id="ac_x509_2.0.xsd" Name="saml-schema-authn-context-x509-2.0.xsd" />
- </Component>
- <Component Id="ac_xmldsig_2.0.xsd" Guid="{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}">
- <File KeyPath="yes" Id="ac_xmldsig_2.0.xsd" Name="saml-schema-authn-context-xmldsig-2.0.xsd" />
- </Component>
- <Component Id="dce_2.0.xsd" Guid="{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}">
- <File KeyPath="yes" Id="dce_2.0.xsd" Name="saml-schema-dce-2.0.xsd" />
- </Component>
- <Component Id="ecp_2.0.xsd" Guid="{D4E12A26-39B7-407B-9177-D67799CEF333}">
- <File KeyPath="yes" Id="ecp_2.0.xsd" Name="saml-schema-ecp-2.0.xsd" />
- </Component>
- <Component Id="metadata_2.0.xsd" Guid="{02823006-3999-4F7B-979E-4BE0C32B6109}">
- <File KeyPath="yes" Id="metadata_2.0.xsd" Name="saml-schema-metadata-2.0.xsd" />
- </Component>
- <Component Id="protocol_2.0.xsd" Guid="{20E92615-EA8B-482C-80A2-6EEB103DA945}">
- <File KeyPath="yes" Id="protocol_2.0.xsd" Name="saml-schema-protocol-2.0.xsd" />
- </Component>
- <Component Id="x500_2.0.xsd" Guid="{1C737F49-4B66-47FD-A1CA-754342DFF868}">
- <File KeyPath="yes" Id="x500_2.0.xsd" Name="saml-schema-x500-2.0.xsd" />
- </Component>
- <Component Id="xacml_2.0.xsd" Guid="{36D94CC5-8DB9-4986-B7A2-D71303966307}">
- <File KeyPath="yes" Id="xacml_2.0.xsd" Name="saml-schema-xacml-2.0.xsd" />
- </Component>
- <Component Id="metadata_attr.xsd" Guid="{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}">
- <File KeyPath="yes" Id="metadata_attr.xsd" Name="sstc-metadata-attr.xsd" />
- </Component>
- <Component Id="request_initiation.xsd" Guid="{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}">
- <File KeyPath="yes" Id="request_initiation.xsd" Name="sstc-request-initiation.xsd" />
- </Component>
- <Component Id="saml1x_metadata.xsd" Guid="{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}">
- <File KeyPath="yes" Id="saml1x_metadata.xsd" Name="sstc-saml1x-metadata.xsd" />
- </Component>
- <Component Id="attribute_ext.xsd" Guid="{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}">
- <File KeyPath="yes" Id="attribute_ext.xsd" Name="sstc-saml-attribute-ext.xsd" />
- </Component>
- <Component Id="delegation.xsd" Guid="{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}">
- <File KeyPath="yes" Id="delegation.xsd" Name="sstc-saml-delegation.xsd" />
- </Component>
- <Component Id="idp_discovery.xsd" Guid="{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}">
- <File KeyPath="yes" Id="idp_discovery.xsd" Name="sstc-saml-idp-discovery.xsd" />
- </Component>
- <Component Id="metadata_algsupport_v1.0.xsd" Guid="{97489B89-9651-4131-82A7-0B9F638FD25C}">
- <File KeyPath="yes" Id="metadata_algsupport_v1.0.xsd" Name="sstc-saml-metadata-algsupport-v1.0.xsd" />
- </Component>
- <Component Id="metadata_ext_query.xsd" Guid="{5F1380C9-7327-4D11-BC9E-CD59CC362B21}">
- <File KeyPath="yes" Id="metadata_ext_query.xsd" Name="sstc-saml-metadata-ext-query.xsd" />
- </Component>
- <Component Id="metadata_ui_v1.0.xsd" Guid="{C203B8C4-0056-46F6-96DE-E831933437D3}">
- <File KeyPath="yes" Id="metadata_ui_v1.0.xsd" Name="sstc-saml-metadata-ui-v1.0.xsd" />
- </Component>
- <Component Id="metadata_rpi_v1.0.xsd" Guid="{51C2294E-A180-4309-AEE2-DC6BEE203DA9}">
- <File KeyPath="yes" Id="metadata_rpi_v1.0.xsd" Name="saml-metadata-rpi-v1.0.xsd" />
- </Component>
- <Component Id="protocol_ext_thirdparty.xsd" Guid="{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}">
- <File KeyPath="yes" Id="protocol_ext_thirdparty.xsd" Name="sstc-saml-protocol-ext-thirdparty.xsd" />
- </Component>
- <Component Id="async_slo_v1.0.xsd" Guid="{C3209C47-3F6D-4C20-B004-C85DDC4AD7E7}">
- <File KeyPath="yes" Id="async_slo_v1.0.xsd" Name="saml-async-slo-v1.0.xsd" />
- </Component>
- </Directory><!-- opensaml -->
- <Directory Id="xmltooling" Name="xmltooling" FileSource="$(var.SPBuildDirectory)\cpp-xmltooling\schemas\">
- <Component Id="xenc_schema.xsd" Guid="{2197D645-3AA3-46F1-B250-0F964B901A94}">
- <File KeyPath="yes" Name="xenc-schema.xsd" />
- </Component>
- <Component Id="xenc11_schema.xsd" Guid="{DC61F4FB-03BB-4ED4-9552-6BE33CE3DF80}">
- <File KeyPath="yes" Name="xenc11-schema.xsd" />
- </Component>
- <Component Id="xmldsig.xsd" Guid="{72871706-1D8F-4695-B573-AF2EB0635281}">
- <File KeyPath="yes" Name="xmldsig-core-schema.xsd" />
- </Component>
- <Component Id="xmldsig11.xsd" Guid="{A0E6F269-77F0-47E6-B59A-887977ECE06A}">
- <File KeyPath="yes" Name="xmldsig11-schema.xsd" />
- </Component>
- <Component Id="soap_envelope.xsd" Guid="{A2B2255D-344E-44E9-B894-5AB3416D8CBC}">
- <File KeyPath="yes" Name="soap-envelope.xsd" />
- </Component>
- <Component Id="xml.xsd" Guid="{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}">
- <File KeyPath="yes" Name="xml.xsd" />
- </Component>
- <Component Id="xmltooling.xsd" Guid="{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}">
- <File KeyPath="yes" Name="xmltooling.xsd" />
- </Component>
- <Component Id="catalog.xml" Guid="{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}">
- <File KeyPath="yes" Name="catalog.xml" Source="$(var.SPBuildDirectory)\cpp-xmltooling\schemas\catalog.xml.in" />
- </Component>
- <Component Id="catalog.xml.in" Guid="{FE4B0B0F-0782-44C1-B8DB-AD4675D2C375}">
- <File KeyPath="yes" Name="catalog.xml.in" />
- </Component>
- </Directory><!-- xmltooling -->
- </Directory><!-- xml -->
- </Directory><!-- SP -->
- </Directory><!-- Shibboleth -->
- </Directory><!-- CommonAppDataFolder -->
- </Directory><!-- TargetDir -->
- <Binary Id="EditCatalogFileSrc" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs" />
- <CustomAction Id="EditXMLToolingCatalog" BinaryKey="EditCatalogFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="EditCatalogSAML10" BinaryKey="EditCatalogFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="EditCatalogSAML11" BinaryKey="EditCatalogFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="EditCatalogSAML20" BinaryKey="EditCatalogFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetEditXMLToolingCatalog" Property="EditXMLToolingCatalog" Value="%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml" />
- <CustomAction Id="SetEditCatalogSAML10" Property="EditCatalogSAML10" Value="%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml" />
- <CustomAction Id="SetEditCatalogSAML11" Property="EditCatalogSAML11" Value="%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml" />
- <CustomAction Id="SetEditCatalogSAML20" Property="EditCatalogSAML20" Value="%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml" />
- <InstallExecuteSequence>
- <Custom Action="SetEditXMLToolingCatalog" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="SetEditCatalogSAML10" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="SetEditCatalogSAML11" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="SetEditCatalogSAML20" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="EditXMLToolingCatalog" After="InstallFiles">NOT Installed</Custom>
- <Custom Action="EditCatalogSAML10" After="InstallFiles">NOT Installed</Custom>
- <Custom Action="EditCatalogSAML11" After="InstallFiles">NOT Installed</Custom>
- <Custom Action="EditCatalogSAML20" After="InstallFiles">NOT Installed</Custom>
- </InstallExecuteSequence>
-
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
deleted file mode 100644
index dadf2848..00000000
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="OpenSAMLMergeModule_x64" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}" Description="Merge Module for OpenSAML (x64)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\x64\Release\">
- <Component Id="saml.dll" Guid="$(var.SamlComponent64)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion).pdb" />
- </Component>
- <Component Id="samlsign.exe" Guid="{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltooling.dll" Guid="$(var.XMLToolingComponent64)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).pdb" />
- </Component>
- <Component Id="xmltooling_lite.dll" Guid="$(var.XMLToolingLiteComponent64)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\x64\Debug\">
- <Component Id="samlD.dll" Guid="$(var.SamlComponent64d)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion)D.pdb" />
- </Component>
- <Component Id="samlsign.exe_debug" Guid="{A6588914-93E1-4FAF-B237-39C0240EECB1}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Id="samlsign.pdb_debug" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltoolingD.dll" Guid="$(var.XMLToolingComponent64d)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.pdb" />
- </Component>
- <Component Id="xmltooling_liteD.dll" Guid="$(var.XMLToolingLiteComponent64d)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.pdb" />
- </Component>
- </Directory><!-- lib_debug -->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="doc" Guid="{F858AC39-4C24-4255-A86E-4747FE45624E}" Win64="yes">
- <File KeyPath="yes" Name="OPENSAML.LICENSE" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt" />
- <File Name="OPENSAML.NOTICE" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt" />
- <File Name="OPENSAML.README" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!--shibboleth_SP-->
- </Directory><!--shibboleth-->
- </Directory><!--ProgramFiles64Folder-->
- </Directory>
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
deleted file mode 100644
index d14699d8..00000000
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="OpenSAMLMergeModule_x86" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{D6367F80-6B31-4554-ABE4-53404DD46F35}" Description="Merge Module for OpenSAML (x86)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Release\">
- <Component Id="saml.dll" Guid="$(var.SamlComponent32)">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion).pdb" />
- </Component>
- <Component Id="samlsign.exe" Guid="{3DC7A431-9623-4283-BA07-444DB1C1F864}">
- <File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltooling.dll" Guid="$(var.XMLToolingComponent32)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).pdb" />
- </Component>
- <Component Id="xmltooling_lite.dll" Guid="$(var.XMLToolingLiteComponent32)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Debug\">
- <Component Id="samlD.dll" Guid="$(var.SamlComponent32d)">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion)D.pdb" />
- </Component>
- <Component Id="samlsign.exe_debug" Guid="{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}">
- <File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Id="samlsign.pdb_debug" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltoolingD.dll" Guid="$(var.XMLToolingComponent32d)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.pdb" />
- </Component>
- <Component Id="xmltooling_liteD.dll" Guid="$(var.XMLToolingLiteComponent32d)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.pdb" />
- </Component>
- </Directory><!-- lib_debug -->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="doc" Guid="{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}">
- <File KeyPath="yes" Name="OPENSAML.LICENSE" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt" />
- <File Name="OPENSAML.NOTICE" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt" />
- <File Name="OPENSAML.README" Source="$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
deleted file mode 100644
index 7ae3cb36..00000000
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<?define ReleaseDir="x64\bin"?>
-<?define DebugDir="x64Debug\bin"?>
-<?define LibEay="libcrypto-$(var.OpenSSLFileVersion)-x64.dll"?>
-<?define LibEayD="libcrypto-$(var.OpenSSLFileVersion)D-x64.dll"?>
-<?define SslEay="libssl-$(var.OpenSSLFileVersion)-x64.dll"?>
-<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D-x64.dll"?>
-
-<?define LibEayPdb="libcrypto-$(var.OpenSSLFileVersion)-x64.pdb"?>
-<?define LibEayDPdb="libcrypto-$(var.OpenSSLFileVersion)D-x64.pdb"?>
-<?define SslEayPdb="libssl-$(var.OpenSSLFileVersion)-x64.pdb"?>
-<?define SslEayDPdb="libssl-$(var.OpenSSLFileVersion)D-x64.pdb"?>
-
-<?define LibEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion)-x64.pdb"?>
-<?define LibEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D-x64.pdb"?>
-<?define SslEayPdbSrc = "$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion)-x64.pdb"?>
-<?define SslEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D-x64.pdb"?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="OpenSSLMergeModule_x64" Language="1033" Version="$(var.OpenSSLVersion)">
- <Package Id="{EEB21422-347C-4AFA-A347-DCA0E5D61572}" Description="Merge Module for OpenSSL (x64)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\">
- <Component Id="libeay32.dll" Guid="$(var.LibEay64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="$(var.LibEay)" />
- <File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" Source="$(var.LibEayPdbSrc)" />
- </Component>
- <Component Id="ssleay32.dll" Guid="$(var.SSlEay64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
- <File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" Source="$(var.SslEayPdbSrc)" />
- </Component>
- <Component Id="openssl.exe" Guid="{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
- <Component Id="libeay32D.dll" Guid="$(var.LibEay64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
- <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" Source="$(var.LibEayDPdbSrc)" />
- </Component>
- <Component Id="ssleay32D.dll" Guid="$(var.SSlEay64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
- <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" Source="$(var.SslEayDPdbSrc)" />
- </Component>
- <Component Id="openssl.exe_debug" Guid="{3555958C-C30D-4829-BC17-936D2EEC3EA4}" Win64="yes">
- <File Id="openssl.exe_debug" KeyPath="yes" Checksum="yes" Name="openssl.exe" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="OPENSSL.LICENSE" Guid="{10B77A21-E554-47F2-99F0-7171304FE899}" Win64="yes">
- <!-- Note the name change for OpenSSL 3.0.0 -->
- <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory>
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
deleted file mode 100644
index 47c42323..00000000
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<?define ReleaseDir="x86\bin"?>
-<?define DebugDir="x86Debug\bin"?>
-<?define LibEay="libcrypto-$(var.OpenSSLFileVersion).dll"?>
-<?define LibEayD="libcrypto-$(var.OpenSSLFileVersion)D.dll"?>
-<?define SslEay="libssl-$(var.OpenSSLFileVersion).dll"?>
-<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D.dll"?>
-
-<?define LibEayPdb ="libcrypto-$(var.OpenSSLFileVersion).pdb"?>
-<?define LibEayDPdb ="libcrypto-$(var.OpenSSLFileVersion)D.pdb"?>
-<?define SslEayPdb ="libssl-$(var.OpenSSLFileVersion).pdb"?>
-<?define SslEayDPdb ="libssl-$(var.OpenSSLFileVersion)D.pdb"?>
-
-<?define LibEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion).pdb"?>
-<?define SslEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion).pdb"?>
-<?define LibEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D.pdb"?>
-<?define SslEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D.pdb"?>
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="OpenSSLMergeModule_x86" Language="1033" Version="$(var.OpenSSLVersion)">
- <Package Id="11FD68EE-607E-4755-98AA-1C7EE5E03652" Description="Merge Module for OpenSSL (x86)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\">
- <Component Id="libeay32.dll" Guid="$(var.LibEay32Component)">
- <File KeyPath="yes" Checksum="yes" Name="$(var.LibEay)" />
- <File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" Source="$(var.LibEayPdbSrc)" />
- </Component>
- <Component Id="ssleay32.dll" Guid="$(var.SSlEay32Component)">
- <File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
- <File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" Source="$(var.SslEayPdbSrc)" />
- </Component>
- <Component Id="openssl.exe" Guid="{886F0254-AD10-45C6-A723-37C7FA466651}">
- <File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
- <Component Id="libeay32D.dll" Guid="$(var.LibEay32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
- <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" Source="$(var.LibEayDPdbSrc)" />
- </Component>
- <Component Id="ssleay32D.dll" Guid="$(var.SSlEay32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
- <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" Source="$(var.SslEayDPdbSrc)" />
- </Component>
- <Component Id="openssl.exe_debug" Guid="{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}">
- <File Id="openssl.exe_debug" KeyPath="yes" Checksum="yes" Name="openssl.exe" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="OPENSSL.LICENSE" Guid="{CEC1CC66-6D48-475A-8C99-B687B0B901AA}">
- <!-- NOTE the name change for OpenSSL 3.0.0 -->
- <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
deleted file mode 100644
index 0adcd437..00000000
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="ShibbolethSPSchemasMergeModule" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}" Description="Merge Module for Shibboleth SP schemas" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <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="catalog.xml" Guid="{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}">
- <File KeyPath="yes" Name="catalog.xml" Source="$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in" />
- </Component>
- <Component Id="catalog.xml.in" Guid="{0CC7F113-DC35-4A6F-8ECA-ED214B4BA720}">
- <File KeyPath="yes" Name="catalog.xml.in" />
- </Component>
- <Component Id="shibboleth.xsd" Guid="{18F3DD83-0C0A-480E-8C87-043C9296DFE5}">
- <File KeyPath="yes" Name="shibboleth.xsd" />
- </Component>
- <Component Id="metadata_1.0.xsd" Guid="{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}">
- <File KeyPath="yes" Id="metadata_1.0.xsd" Name="shibboleth-metadata-1.0.xsd" />
- </Component>
- <Component Id="attribute_map.xsd" Guid="{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}">
- <File KeyPath="yes" Id="attribute_map.xsd" Name="shibboleth-2.0-attribute-map.xsd" />
- </Component>
- <Component Id="afp.xsd" Guid="{9672ADDF-8053-41C3-A58A-C8B99C710336}">
- <File KeyPath="yes" Id="afp.xsd" Name="shibboleth-2.0-afp.xsd" />
- </Component>
- <Component Id="afp_mf_basic.xsd" Guid="{D1C32485-D3DF-414C-B2FF-721F169CAC05}">
- <File KeyPath="yes" Id="afp_mf_basic.xsd" Name="shibboleth-2.0-afp-mf-basic.xsd" />
- </Component>
- <Component Id="afp_mf_saml.xsd" Guid="{40B8AEF3-0A31-4204-95E7-F8079CB55979}">
- <File KeyPath="yes" Id="afp_mf_saml.xsd" Name="shibboleth-2.0-afp-mf-saml.xsd" />
- </Component>
- <Component Id="sp_notify.xsd" Guid="{65EBC9F1-C958-4B17-9554-7F86186A15C1}">
- <File KeyPath="yes" Id="sp_notify.xsd" Name="shibboleth-2.0-sp-notify.xsd" />
- </Component>
- <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>
- <Component Id="native_sp3_config.xsd" Guid="{88E6E195-F004-4104-B6B3-62317BF75E5C}">
- <File KeyPath="yes" Id="native_sp3_config.xsd" Name="shibboleth-3.0-native-sp-config.xsd" />
- </Component>
- <Component Id="native_sp_protocols.xsd" Guid="{AE42FFFB-1A59-4F1D-9935-15D727B99929}">
- <File KeyPath="yes" Id="native_sp_protocols.xsd" Name="shibboleth-2.0-native-sp-protocols.xsd" />
- </Component>
- <Component Id="WSTrust.xsd" Guid="{91EA82B5-A19C-40C0-8D1C-40FA020A484E}">
- <File KeyPath="yes" Name="WS-Trust.xsd" />
- </Component>
- <Component Id="MetadataExchange.xsd" Guid="{B5DE4E0E-1426-4195-8ACD-7B320475E843}">
- <File KeyPath="yes" Name="MetadataExchange.xsd" />
- </Component>
- <Component Id="ws_sec_secext_1.0.xsd" Guid="{2F05116D-5F22-4AB3-A534-844ABA9E00F2}">
- <File KeyPath="yes" Name="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
- </Component>
- <Component Id="ws_sec_util_1.0.xsd" Guid="{F6E06D89-8F8D-451F-A134-748ED283334B}">
- <File KeyPath="yes" Name="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
- </Component>
- <Component Id="ws_addr.xsd" Guid="{7D4DC4F1-2963-4A36-B21E-2BF655EF0500}">
- <File KeyPath="yes" Name="ws-addr.xsd" />
- </Component>
- <Component Id="ws_authorization.xsd" Guid="{DD219CDF-6466-4EE7-A472-DDA42C75E38F}">
- <File KeyPath="yes" Name="ws-authorization.xsd" />
- </Component>
- <Component Id="ws_federation.xsd" Guid="{C7496788-5817-477A-AFCE-1C38FA52A7DC}">
- <File KeyPath="yes" Name="ws-federation.xsd" />
- </Component>
- <Component Id="ws_secpol_1.2.xsd" Guid="{7FEC0E0D-F911-4CF7-B2AB-8EB6499DAD98}">
- <File KeyPath="yes" Name="ws-securitypolicy-1.2.xsd" />
- </Component>
- </Directory><!--xml_shibboleth-->
- </Directory><!--xml-->
- </Directory><!--SP-->
- </Directory><!--Shibboleth-->
- </Directory><!--CommonAppDataFolder-->
- </Directory><!--TargetDir-->
- <Binary Id="EditCatalogFileSrc" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs" />
- <CustomAction Id="EditShibbolethCatalog" BinaryKey="EditCatalogFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetEditShibbolethCatalog" Property="EditShibbolethCatalog" Value="%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml" />
- <InstallExecuteSequence>
- <Custom Action="SetEditShibbolethCatalog" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="EditShibbolethCatalog" After="InstallFiles">NOT Installed</Custom>
- </InstallExecuteSequence>
-
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
deleted file mode 100644
index 308adeba..00000000
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="ShibbolethSPMergeModule_x64" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}" Description="Merge Module for Shibboleth SP DLLs (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\x64\Release">
- <Component Id="shibsp.dll" Guid="$(var.ShibDll64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion).pdb" />
- </Component>
- <Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\x64\Debug">
- <Component Id="shibspD.dll" Guid="$(var.ShibDll64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion)D.pdb" />
- </Component>
- <Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.pdb" />
- </Component>
- </Directory><!-- lib_debug -->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="doc" Guid="{1ACB430F-7846-4565-93FE-3BE1BC1235C1}" Win64="yes">
- <File KeyPath="yes" Name="SHIBBOLETH.LICENSE" Source="$(var.SPBuildDirectory)\doc\LICENSE.txt" />
- <File Name="SHIBBOLETH.NOTICE" Source="$(var.SPBuildDirectory)\doc\NOTICE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFiles64Folder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
-
-
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
deleted file mode 100644
index ba7289f8..00000000
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="ShibbolethSPMergeModule_x86" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}" Description="Merge Module for Shibboleth SP DLLs (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Release">
- <Component Id="shibsp.dll" Guid="$(var.ShibDll32Component)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion).pdb" />
- </Component>
- <Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite32Component)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Debug">
- <Component Id="shibspD.dll" Guid="$(var.ShibDll32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion)D.pdb" />
- </Component>
- <Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.pdb" />
- </Component>
- </Directory><!-- lib_debug -->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="doc" Guid="{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}">
- <File KeyPath="yes" Name="SHIBBOLETH.LICENSE" Source="$(var.SPBuildDirectory)\doc\LICENSE.txt" />
- <File Name="SHIBBOLETH.NOTICE" Source="$(var.SPBuildDirectory)\doc\NOTICE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
deleted file mode 100644
index 6d2c1d34..00000000
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="XercesMergeModule_x86" Language="1033" Version="$(var.XercesVersion)">
- <Package Id="{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}" Description="Merge Module for Xerces (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="xercesc.dll" Guid="$(var.Xerces64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
- <!-- <File KeyPath="no" Checksum="no" Source="$(var.XercesPdb)" /> -->
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="xercescD.dll" Guid="$(var.Xerces64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
- <File KeyPath="no" Checksum="no" Source="$(var.XercesDebugPdb)" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="XERCES.LICENSE" Guid="{12731F0B-681B-4154-9B02-BEB219954D44}" Win64="yes">
- <File KeyPath="yes" Name="XERCES.LICENSE" Source="$(var.BuildDirectory)\$(var.xerces)\LICENSE" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
deleted file mode 100644
index 32288532..00000000
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="XercesMergeModule_x86" Language="1033" Version="$(var.XercesVersion)">
- <Package Id="{5A32778E-B904-4828-90CD-A317B4F6DF7D}" Description="Merge Module for Xerces (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="xercesc.dll" Guid="$(var.Xerces32Component)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
- <!-- <File KeyPath="no" Checksum="no" Source="$(var.XercesPdb)" /> -->
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="xercescD.dll" Guid="$(var.Xerces32Componentd)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
- <File KeyPath="no" Checksum="no" Source="$(var.XercesDebugPdb)" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="XERCES.LICENSE" Guid="{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}">
- <File KeyPath="yes" Name="XERCES.LICENSE" Source="$(var.BuildDirectory)\$(var.xerces)\LICENSE" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_SP -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
deleted file mode 100644
index b9e23049..00000000
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="XmlSecmergemodule_x64" Language="1033" Version="$(var.XmlSecVersion)">
- <Package Id="{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}" Description="Merge Module for XmlSec (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Release">
- <Component Id="xsec.dll" Guid="$(var.XmlSec64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="xsec_lib.pdb" />
- </Component>
- <Component Id="c14n.exe" Guid="{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
- <File KeyPath="no" Checksum="no" Name="c14n.pdb" />
- </Component>
- <Component Id="checksig.exe" Guid="{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
- <File KeyPath="no" Checksum="no" Name="checksig.pdb" />
- </Component>
- <Component Id="cipher.exe" Guid="{192AEEF7-3AE2-4570-AA30-1A2046646A84}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
- <File KeyPath="no" Checksum="no" Name="cipher.pdb" />
- </Component>
- <Component Id="siginf.exe" Guid="{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
- <File KeyPath="no" Checksum="no" Name="siginf.pdb" />
- </Component>
- <Component Id="templatesign.exe" Guid="{71B603E6-A54B-4843-A4F8-826AD4CA6A04}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
- <File KeyPath="no" Checksum="no" Name="templatesign.pdb" />
- </Component>
- <Component Id="txfmout.exe" Guid="{2D9025EE-D95F-4D3C-B0E7-86D742749D39}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
- <File KeyPath="no" Checksum="no" Name="txfmout.pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug">
- <Component Id="xsecD.dll" Guid="$(var.XmlSec64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />
- </Component>
- <Component Id="c14n.exe_debug" Guid="{ED9BB341-C5D2-4234-B720-483D86D340F9}" Win64="yes">
- <File Id="c14n.exe_debug" KeyPath="yes" Checksum="yes" Name="c14n.exe" />
- <File Id="c14n.pdb_debug" KeyPath="no" Checksum="no" Name="c14n.pdb" />
- </Component>
- <Component Id="checksig.exe_debug" Guid="{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}" Win64="yes">
- <File Id="checksig.exe_debug" KeyPath="yes" Checksum="yes" Name="checksig.exe" />
- <File Id="checksig.pdb_debug" KeyPath="no" Checksum="no" Name="checksig.pdb" />
- </Component>
- <Component Id="cipher.exe_debug" Guid="{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}" Win64="yes">
- <File Id="cipher.exe_debug" KeyPath="yes" Checksum="yes" Name="cipher.exe" />
- <File Id="cipher.pdb_debug" KeyPath="no" Checksum="no" Name="cipher.pdb" />
- </Component>
- <Component Id="siginf.exe_debug" Guid="{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}" Win64="yes">
- <File Id="siginf.exe_debug" KeyPath="yes" Checksum="yes" Name="siginf.exe" />
- <File Id="siginf.pdb_debug" KeyPath="no" Checksum="no" Name="siginf.pdb" />
- </Component>
- <Component Id="templatesign.exe_debug" Guid="{5AE22CDB-625E-4DC7-9586-77C3DD835100}" Win64="yes">
- <File Id="templatesign.exe_debug" KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
- <File Id="templatesign.pdb_debug" KeyPath="no" Checksum="no" Name="templatesign.pdb" />
- </Component>
- <Component Id="txfmout.exe_debug" Guid="{373B4E3D-6643-4884-8D0C-324DEF910230}" Win64="yes">
- <File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
- <File Id="txfmout.pdb_debug" KeyPath="no" Checksum="no" Name="txfmout.pdb" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="XMLSEC.LICENSE" Guid="{07288B10-ED5A-443F-BC90-CFD987C798C4}" Win64="yes">
- <File KeyPath="yes" Name="XMLSEC.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
deleted file mode 100644
index 34193396..00000000
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="XmlSecMergeModule_x86" Language="1033" Version="$(var.XmlSecVersion)">
- <Package Id="{D1678DAE-81D9-4756-ABE6-7D1218F0D350}" Description="Merge Module for XmlSec (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_SP" Name="SP">
- <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Release">
- <Component Id="xsec.dll" Guid="$(var.XmlSec32Component)">
- <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="xsec_lib.pdb" />
- </Component>
- <Component Id="c14n.exe" Guid="{576EB311-AADA-49D3-B444-7EDC37C715F3}">
- <File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
- <File KeyPath="no" Checksum="no" Name="c14n.pdb" />
- </Component>
- <Component Id="checksig.exe" Guid="{F0C2B97A-7B93-4CD3-9432-E5904D337815}">
- <File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
- <File KeyPath="no" Checksum="no" Name="checksig.pdb" />
- </Component>
- <Component Id="cipher.exe" Guid="{654BB761-7B9D-4766-AC5F-DC174E7B94AE}">
- <File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
- <File KeyPath="no" Checksum="no" Name="cipher.pdb" />
- </Component>
- <Component Id="siginf.exe" Guid="{1B278BD9-6507-4613-9315-8D47CAEBC3D8}">
- <File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
- <File KeyPath="no" Checksum="no" Name="siginf.pdb" />
- </Component>
- <Component Id="templatesign.exe" Guid="{A24CD56C-F615-406E-B4E2-4AC5EAE99206}">
- <File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
- <File KeyPath="no" Checksum="no" Name="templatesign.pdb" />
- </Component>
- <Component Id="txfmout.exe" Guid="{667DD190-335B-4AB7-BBA5-25B5F847F363}">
- <File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
- <File KeyPath="no" Checksum="no" Name="txfmout.pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug">
- <Component Id="xsecD.dll" Guid="$(var.XmlSec32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />
- </Component>
- <Component Id="c14n.exe_debug" Guid="{20506FEA-CCFF-46A2-9753-DBBA8A967003}">
- <File Id="c14n.exe_debug" KeyPath="yes" Checksum="yes" Name="c14n.exe" />
- <File Id="c14n.pdb_debug" KeyPath="no" Checksum="no" Name="c14n.pdb" />
- </Component>
- <Component Id="checksig.exe_debug" Guid="{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}">
- <File Id="checksig.exe_debug" KeyPath="yes" Checksum="yes" Name="checksig.exe" />
- <File Id="checksig.pdb_debug" KeyPath="no" Checksum="no" Name="checksig.pdb" />
- </Component>
- <Component Id="cipher.exe_debug" Guid="{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}">
- <File Id="cipher.exe_debug" KeyPath="yes" Checksum="yes" Name="cipher.exe" />
- <File Id="cipher.pdb_debug" KeyPath="no" Checksum="no" Name="cipher.pdb" />
- </Component>
- <Component Id="siginf.exe_debug" Guid="{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}">
- <File Id="siginf.exe_debug" KeyPath="yes" Checksum="yes" Name="siginf.exe" />
- <File Id="siginf.pdb_debug" KeyPath="no" Checksum="no" Name="siginf.pdb" />
- </Component>
- <Component Id="templatesign.exe_debug" Guid="{5E8264B4-D759-4502-B989-5A5C56FBD875}">
- <File Id="templatesign.exe_debug" KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
- <File Id="templatesign.pdb_debug" KeyPath="no" Checksum="no" Name="templatesign.pdb" />
- </Component>
- <Component Id="txfmout.exe_debug" Guid="{FCBFBCAA-5C39-470A-BD58-E558C384898D}">
- <File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
- <File Id="txfmout.pdb_debug" KeyPath="no" Checksum="no" Name="txfmout.pdb" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- <Directory Id="doc" Name="doc">
- <Component Id="XMLSEC.LICENSE" Guid="{FF81AD29-36DF-42BD-AFC9-211F083D9872}">
- <File KeyPath="yes" Name="XMLSEC.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
- </Component>
- </Directory><!-- doc -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
deleted file mode 100644
index 6a5e63dc..00000000
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="ZlibMergeModule_x86" Language="1033" Version="$(var.ZlibVersion)">
- <Package Id="{68821F70-8952-4778-8149-85A93E4BF426}" Description="Merge Module for Zlib (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="zlib1.dll" Guid="$(var.Zlib64Component)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Release\zlib$(var.ZlibFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Release\zlib$(var.ZlibFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="zlib1d.dll" Guid="$(var.Zlib64Componentd)" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Debug\zlib$(var.ZlibFileVersion)d.pdb" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
deleted file mode 100644
index 156219b5..00000000
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="ZlibMergeModule_x86" Language="1033" Version="$(var.ZlibVersion)">
- <Package Id="{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}" Description="Merge Module for Zlib (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
- <Directory Id="shibboleth" Name="Shibboleth">
- <Directory Id="shibboleth_sp" Name="SP">
- <Directory Id="lib" Name="lib">
- <Component Id="zlib1.dll" Guid="$(var.Zlib32Component)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <Directory Id="lib_debug" Name="debug">
- <Component Id="zlib1d.dll" Guid="$(var.Zlib32Componentd)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\Debug\zlib$(var.ZlibFileVersion)d.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\Debug\zlib$(var.ZlibFileVersion)d.pdb" />
- </Component>
- </Directory><!-- lib_debug-->
- <?endif ?>
- </Directory><!-- lib -->
- </Directory><!-- shibboleth_sp -->
- </Directory><!-- shibboleth -->
- </Directory><!-- ProgramFilesFolder -->
- </Directory><!-- TARGETDIR -->
- </Module>
-</Wix>
diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
deleted file mode 100644
index e5565377..00000000
--- a/msi/WiX/Patch-x64.wxs
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <PatchCreation Id="{17B36DC5-D54C-4484-9735-0E57B2866153}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win64.pcp" WholeFilesOnly="yes">
-
- <!-- Information put into the summary (Details) field -->
-
- <PatchInformation Description="Security Patch for Shibboleth SP 2.5.3 (x64)" Comments="Provides OpenSSL 1.0.1h" ShortNames="no" Languages="1033" Compressed="yes" Manufacturer="Shibboleth Consortium" />
-
- <!-- Recommended values for 'Classification' are
- Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup.
-
- DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
- -->
-
- <PatchMetadata AllowRemoval="yes" Description="Security Patch for Shibboleth SP 2.5.3 (x64)" ManufacturerName="Shibboleth Consortium" TargetProductName="Shibboleth SP" MoreInfoURL="http://shibboleth.net/" Classification="Security Rollup" DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3" />
-
- <!-- Note:
- That SequenceStart must be greater than the last
- sequence in the File table in the target package or the patch
- will not install. -->
-
- <Family DiskId="5000" MediaSrcProp="Sample" Name="Sample" SequenceStart="5000">
- <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win64\shibboleth-sp-2.5.3-win64.msi" Id="Upgrade">
- <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win64\shibboleth-sp-2.5.3-orig-win64.msi" Order="2" Id="Target" IgnoreMissingFiles="no" />
- </UpgradeImage>
- </Family>
-
- <!-- Supersede: Set this value to 'yes' to indicate that this patch will
- supersede all previous patches in this patch family. The
- default value is 'no'.
-
- PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
- -->
-
- <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily" Sequence="2.0.0.0" Supersede="yes" />
-
- </PatchCreation>
-</Wix>
diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
deleted file mode 100644
index de3b385b..00000000
--- a/msi/WiX/Patch-x86.wxs
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <PatchCreation Id="{875E0FB8-5238-4487-912A-04B043CEB5FB}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win32.pcp" WholeFilesOnly="yes">
-
- <!-- Information put into the summary (Details) field -->
-
- <PatchInformation Description="Security Patch for Shibboleth SP 2.5.3 (x86)" Comments="Provides OpenSSL 1.0.1h" ShortNames="no" Languages="1033" Compressed="yes" Manufacturer="Shibboleth Consortium" />
-
- <!-- Recommended values for 'Classification' are
- Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup.
-
- DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
- -->
-
- <PatchMetadata AllowRemoval="yes" Description="Security Patch for Shibboleth SP 2.5.3 (x86)" ManufacturerName="Shibboleth Consortium" TargetProductName="Shibboleth SP" MoreInfoURL="http://shibboleth.net/" Classification="Security Rollup" DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3" />
-
- <!-- Note:
- That SequenceStart must be greater than the last
- sequence in the File table in the target package or the patch
- will not install. -->
-
- <Family DiskId="5000" MediaSrcProp="Sample" Name="Sample" SequenceStart="5000">
- <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win32\shibboleth-sp-2.5.3-win32.msi" Id="Upgrade">
- <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win32\shibboleth-sp-2.5.3-orig-win32.msi" Order="2" Id="Target" IgnoreMissingFiles="no" />
- </UpgradeImage>
- </Family>
-
- <!-- Supersede: Set this value to 'yes' to indicate that this patch will
- supersede all previous patches in this patch family. The
- default value is 'no'.
-
- PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
- -->
-
- <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily" Sequence="2.0.0.0" Supersede="yes" />
-
- </PatchCreation>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
deleted file mode 100644
index d4865152..00000000
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- ShibbolethSP-noarch -->
-
- <ComponentRef Id="ProtectInstallDir"/>
- <ComponentRef Id="main.css" />
- <ComponentRef Id="CREDITS.txt" />
- <ComponentRef Id="LICENSE.txt" />
- <ComponentRef Id="NOTICE.txt" />
- <ComponentRef Id="README.txt" />
- <ComponentRef Id="RELEASE.txt" />
-
- <ComponentRef Id="example_metadata.xml" />
- <ComponentRef Id="example_shibboleth2.xml" />
- <ComponentRef Id="keygen.bat" />
- <ComponentRef Id="seckeygen.bat" />
- <ComponentRef Id="attrChecker.html" />
- <ComponentRef Id="sslError.html" />
- <ComponentRef Id="bindingTemplate.html" />
- <ComponentRef Id="globalLogout.html" />
- <ComponentRef Id="localLogout.html" />
- <ComponentRef Id="attribute_map.xml" />
- <ComponentRef Id="attribute_policy.xml" />
- <ComponentRef Id="shibboleth2.xml" />
- <ComponentRef Id="console.logger" />
- <ComponentRef Id="discoveryTemplate.html" />
- <ComponentRef Id="postTemplate.html" />
- <ComponentRef Id="partialLogout.html" />
- <ComponentRef Id="protocols.xml" />
- <ComponentRef Id="security_policy.xml" />
- <ComponentRef Id="apache.config.in" />
- <ComponentRef Id="apache2.config.in" />
- <ComponentRef Id="apache22.config.in" />
- <ComponentRef Id="apache24.config.in" />
- <ComponentRef Id="metadataError.html" />
- <ComponentRef Id="win_native.logger" />
- <ComponentRef Id="win_native.logger_in" />
- <ComponentRef Id="sessionError.html" />
- <ComponentRef Id="shibd.logger.in" />
- <ComponentRef Id="var_cache_shibboleth_folder" />
- <ComponentRef Id="var_log_shibboleth_folder" />
- <ComponentRef Id="var_run_shibboleth_folder" />
-
- <!-- ShibbolethSP-exe-x86-->
-
- <ComponentRef Id="resolvertest.exe" />
- <ComponentRef Id="mdquery.exe" />
- <?if $(var.BuildDebug) != "" ?>
- <ComponentRef Id="resolvertest.exe_debug" />
- <ComponentRef Id="mdquery.exe_debug" />
- <?endif ?>
-
- <ComponentRef Id="adfs.so" />
- <ComponentRef Id="adfs_lite.so" />
- <ComponentRef Id="isapi_shib.dll" />
- <ComponentRef Id="iis7_shib.dll" />
- <ComponentRef Id="mod_shib_22.so" />
- <?if $(var.NSApi) != "" ?>
- <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" />
- <?if $(var.FCGI) != "" ?>
- <ComponentRef Id="shibauthorizer.exe" />
- <ComponentRef Id="shibresponder.exe" />
- <?endif ?>
-
- <?if $(var.BuildDebug) != "" ?>
- <ComponentRef Id="adfs.so_debug" />
- <ComponentRef Id="adfs_lite.so_debug" />
- <ComponentRef Id="isapi_shib.dll_debug" />
- <ComponentRef Id="iis7_shib.dll_debug" />
- <ComponentRef Id="mod_shib_22.so_debug" />
- <?if $(var.NSApi) != "" ?>
- <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" />
- <?if $(var.FCGI) != "" ?>
- <ComponentRef Id="shibauthorizer.exe_debug" />
- <ComponentRef Id="shibresponder.exe_debug" />
- <?endif ?>
-
- <ComponentRef Id="shibd.exe_debug" />
- <?endif ?>
-
- <!-- ShibbolethSP-registry-x32 -->
- <ComponentRef Id="TargetDir" />
- <ComponentRef Id="shib.ico" />
-</Include>
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
deleted file mode 100644
index 4a8c167b..00000000
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
- <Fragment>
- <!-- Configuration, licenses and documentation -->
- <DirectoryRef Id="INSTALLDIR">
- <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" />
- <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb" Name="resolvertest.pdb" />
- </Component>
- <Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="mdquery64.exe" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery64.pfb" Name="mdquery.pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb_debug" Name="resolvertest.pdb" />
- </Component>
- <Component Id="mdquery64.exe_debug" Guid="{2153EDFC-9962-4AF4-8071-40D0FF497BF9}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="mdquery64.exe_debug" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery64.pdb_debug" Name="mdquery.pdb" />
- </Component>
- </Directory><!-- bin_debug -->
- <?endif ?>
- </Directory><!-- bin -->
- <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" />
- <File KeyPath="no" Checksum="no" Id="adfs64.pdb" Name="adfs.pdb" />
- </Component>
- <Component Id="adfs_lite64.so" Guid="{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb" Name="adfs-lite.pdb" />
- </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" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb" Name="isapi_shib.pdb" />
- </Component>
- <Component Id="iis7_shib64.dll" Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb" Name="iis7_shib.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb" Name="mod_shib_22.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb" Name="mod_shib_24.pdb" />
- </Component>
- <Component Id="odbc_store64.so" Guid="{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="odbc_store64.so" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb" Name="odbc-store.pdb" />
- </Component>
- <Component Id="plugins64.so" Guid="{C78105F1-1258-41A4-8505-5437E90FB1B4}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="plugins64.so" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins64.pdb" Name="plugins.pdb" />
- </Component>
- <Component Id="plugins_lite64.so" Guid="{83CA3D25-2370-426A-9747-B8A74EFC9037}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb" Name="plugins-lite.pdb" />
- </Component>
- <?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer64.exe" Guid="{5A323F4F-AE87-451A-9253-1965E46C9C5F}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb" Name="shibauthorizer.pdb" />
- </Component>
- <Component Id="shibresponder64.exe" Guid="{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb" Name="shibresponder.pdb" />
- </Component>
- <?endif ?>
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="adfs64.pdb_debug" Name="adfs.pdb" />
- </Component>
- <Component Id="adfs_lite64.so_debug" Guid="{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so_debug" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb_debug" Name="adfs-lite.pdb" />
- </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" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb_debug" Name="isapi_shib.pdb" />
- </Component>
- <Component Id="iis7_shib64.dll_debug" Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll_debug" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb_debug" Name="iis7_shib.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb_debug" Name="mod_shib_22.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb_debug" Name="mod_shib_24.pdb" />
- </Component>
- <Component Id="odbc_store64.so_debug" Guid="{586CE55A-F089-4541-96D5-5EE26F8FC471}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="odbc_store64.so_debug" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb_debug" Name="odbc-store.pdb" />
- </Component>
- <Component Id="plugins64.so_debug" Guid="{E6E051C8-6C84-4CC9-B718-365E627068B6}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="plugins64.so_debug" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins64.pdb_debug" Name="plugins.pdb" />
- </Component>
- <Component Id="plugins_lite64.so_debug" Guid="{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so_debug" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb_debug" Name="plugins-lite.pdb" />
- </Component>
- <?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer64.exe_debug" Guid="{642C9137-66C8-4E2E-A76C-4D9F65B17157}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe_debug" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb_debug" Name="shibauthorizer.pdb" />
- </Component>
- <Component Id="shibresponder64.exe_debug" Guid="{7947F31A-1429-44FC-85B2-BF1E7AA50D20}" Win64="yes">
- <File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe_debug" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb_debug" Name="shibresponder.pdb" />
- </Component>
- <?endif ?>
- </Directory><!-- lib_shibboleth_debug -->
- <?endif ?>
- </Directory><!-- lib_shibboleth -->
- </Directory><!-- lib -->
- <!-- the service bin -->
- <Directory Id="sbin64" Name="sbin64" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
- <!-- Service bins are declared in main -->
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="shibd64.pdb_debug" Name="shibd.pdb" />
- </Component>
- </Directory><!-- sbin_debug -->
- <?endif ?>
- </Directory><!-- sbin -->
- </DirectoryRef><!-- INSTALLDIR -->
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
deleted file mode 100644
index 1237838e..00000000
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
- <Fragment>
- <!-- Configuration, licenses and documentation -->
- <DirectoryRef Id="INSTALLDIR">
- <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" />
- <File KeyPath="no" Checksum="no" Name="resolvertest.pdb" />
- </Component>
- <Component Id="mdquery.exe" Guid="{5F322597-3B26-48E5-95BA-CF991CF6D6DB}">
- <File KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Name="mdquery.pdb" />
- </Component>
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="resolvertest.pdb_debug" Name="resolvertest.pdb" />
- </Component>
- <Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
- <File KeyPath="yes" Checksum="yes" Id="mdquery.exe_debug" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery.pdb_debug" Name="mdquery.pdb" />
- </Component>
- </Directory><!-- bin_debug -->
- <?endif ?>
- </Directory><!-- bin -->
- <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" />
- <File KeyPath="no" Checksum="no" Name="adfs.pdb" />
- </Component>
- <Component Id="adfs_lite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
- <File KeyPath="yes" Checksum="yes" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Name="adfs-lite.pdb" />
- </Component>
- <Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
- <File KeyPath="yes" Checksum="yes" Name="isapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="isapi_shib.pdb" />
- </Component>
- <Component Id="iis7_shib.dll" Guid="{2DC61347-E3C9-467c-8530-6A369B53C729}">
- <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="iis7_shib.pdb" />
- </Component>
- <Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
- <File KeyPath="yes" Checksum="yes" Name="mod_shib_22.so" />
- <File KeyPath="no" Checksum="no" Name="mod_shib_22.pdb" />
- </Component>
- <Component Id="mod_shib_24.so" Guid="{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}">
- <File KeyPath="yes" Checksum="yes" Name="mod_shib_24.so" />
- <File KeyPath="no" Checksum="no" Name="mod_shib_24.pdb" />
- </Component>
- <?if $(var.NSApi) != "" ?>
- <Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
- <File KeyPath="yes" Checksum="yes" Name="nsapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="nsapi_shib.pdb" />
- </Component>
- <?endif ?>
- <Component Id="odbc_store.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
- <File KeyPath="yes" Checksum="yes" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Name="odbc-store.pdb" />
- </Component>
- <Component Id="plugins.so" Guid="{F738E29B-903B-4C86-BE27-4C72EC69915E}">
- <File KeyPath="yes" Checksum="yes" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Name="plugins.pdb" />
- </Component>
- <Component Id="plugins_lite.so" Guid="{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}">
- <File KeyPath="yes" Checksum="yes" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Name="plugins-lite.pdb" />
- </Component>
- <?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
- <File KeyPath="yes" Checksum="yes" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Name="shibauthorizer.pdb" />
- </Component>
- <Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
- <File KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Name="shibresponder.pdb" />
- </Component>
- <?endif ?>
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="adfs.pdb_debug" Name="adfs.pdb" />
- </Component>
- <Component Id="adfs_lite.so_debug" Guid="{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}">
- <File KeyPath="yes" Checksum="yes" Id="adfs_lite.so_debug" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite.pdb_debug" Name="adfs-lite.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib.pdb_debug" Name="isapi_shib.pdb" />
- </Component>
- <Component Id="iis7_shib.dll_debug" Guid="{24FC91C7-1401-4ac1-BC14-E881E47D88BD}">
- <File KeyPath="yes" Checksum="yes" Id="iis7_shib.dll_debug" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib.pdb_debug" Name="iis7_shib.pdb" />
- </Component>
- <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" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_22.pdb_debug" Name="mod_shib_22.pdb" />
- </Component>
- <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="no" Checksum="no" Id="mod_shib_24.pdb_debug" Name="mod_shib_24.pdb" />
- </Component>
- <?if $(var.NSApi) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="nsapi_shib.pdb_debug" Name="nsapi_shib.pdb" />
- </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" />
- <File KeyPath="no" Checksum="no" Id="odbc_store.pdb_debug" Name="odbc-store.pdb" />
- </Component>
- <Component Id="plugins.so_debug" Guid="{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}">
- <File KeyPath="yes" Checksum="yes" Id="plugins.so_debug" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins.pdb_debug" Name="plugins.pdb" />
- </Component>
- <Component Id="plugins_lite.so_debug" Guid="{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}">
- <File KeyPath="yes" Checksum="yes" Id="plugins_lite.so_debug" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite.pdb_debug" Name="plugins-lite.pdb" />
- </Component>
- <?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer.exe_debug" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
- <File KeyPath="yes" Checksum="yes" Id="shibauthorizer.exe_debug" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer.pdb_debug" Name="shibauthorizer.pdb" />
- </Component>
- <Component Id="shibresponder.exe_debug" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
- <File KeyPath="yes" Checksum="yes" Id="shibresponder.exe_debug" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder.pdb_debug" Name="shibresponder.pdb" />
- </Component>
- <?endif ?>
- </Directory><!-- lib_shibboleth_debug -->
- <?endif ?>
- </Directory><!-- lib_shibboleth -->
- </Directory><!-- lib -->
- <!-- the service bin -->
- <Directory Id="sbin" Name="sbin" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
- <!-- Service bin is installed in main-x86 (with service) and main-64 (without) -->
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- <File KeyPath="no" Checksum="no" Id="shibd.pdb_debug" Name="shibd.pdb" />
- </Component>
- </Directory><!-- sbin_debug -->
- <?endif ?>
- </Directory><!-- sbin -->
- </DirectoryRef><!-- INSTALLDIR -->
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
deleted file mode 100644
index 042e54e9..00000000
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
- <Fragment>
-
- <WixVariable Id="WixUILicenseRtf" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\license.rtf" />
- <WixVariable Id="WixUIBannerBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\TopBanner.bmp" />
- <WixVariable Id="WixUIDialogBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\Dialog.bmp" />
- <WixVariable Id="WixUICostingPopupOptOut" Value="1" />
-
- <!-- GUI For Shibboleth installer. Uses the Wix packages, but linked in
- blindly by looking at documentation (for sizes and dialog names)
- and the generated.msi -->
-
- <!-- Property that Light complained for -->
- <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-
- <!-- "You must set a property named WIXUI_INSTALLDIR with a value
- of the ID of the directory you want the user to be able to specify
- the location of." -->
-
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-
- <UI Id="ShibbolethInstallDir">
-
- <!-- "WixUI_InstallDir includes the following dialogs:" -->
- <DialogRef Id="BrowseDlg" />
- <DialogRef Id="DiskCostDlg" />
- <DialogRef Id="InvalidDirDlg" />
- <DialogRef Id="LicenseAgreementDlg" />
- <DialogRef Id="WelcomeDlg" />
-
- <!-- "In addition, WixUI_InstallDir includes the following common
- dialogs that appear in all WixUI dialog sets:" -->
- <DialogRef Id="CancelDlg" />
- <DialogRef Id="ErrorDlg" />
- <DialogRef Id="ExitDialog" />
- <DialogRef Id="FatalError" />
- <DialogRef Id="FilesInUse" />
- <DialogRef Id="MaintenanceTypeDlg" />
- <DialogRef Id="MaintenanceWelcomeDlg" />
- <DialogRef Id="MsiRMFilesInUse" />
- <DialogRef Id="OutOfDiskDlg" />
- <DialogRef Id="OutOfRbDiskDlg" />
- <DialogRef Id="PrepareDlg" />
- <DialogRef Id="ProgressDlg" />
- <DialogRef Id="ResumeDlg" />
- <DialogRef Id="UserExit" />
- <DialogRef Id="VerifyReadyDlg" />
- <DialogRef Id="WaitForCostingDlg" />
-
- <!-- We also define two dialogs -->
- <DialogRef Id="UpdateDlgShib" />
- <DialogRef Id="InstallDirDlgShib" />
-
- <!-- Text Styles (from Orca) -->
- <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
- <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
- <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
- <!-- Events (from Orca\ControlEvent and from light's complaints) -->
- <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
- <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4">
- WIXUI_INSTALLDIR_VALID<>"1"
- </Publish>
-
- <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib">
- LicenseAccepted = "1"
- </Publish>
-
- <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
-
- <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">
- (NOT Installed) AND (NOT ALREADYINSTALLED)
- </Publish>
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </Publish>
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">
- Installed AND PATCH
- </Publish>
-
- <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return">1</Publish>
- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">
- Installed AND PATCH
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib">
- (NOT Installed) AND (NOT ALREADYINSTALLED)
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
- Installed AND NOT PATCH
- </Publish>
-
- </UI>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
deleted file mode 100644
index e36f024a..00000000
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- This file contains the description of the dialog which captures installation
- values for first time installs -->
- <Fragment>
-
- <UI>
-
- <!-- This Dialog sets up:
- - INSTALLDIR
- - INSTALL_IIS7_PLUGIN (if IIS about)
- -->
-
- <Dialog Id="InstallDirDlgShib" Width="370" Height="270" Title="[ProductName] Setup">
- <!-- Stuff at the top: picture, some text, a line -->
- <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
- <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Configure Shibboleth" Transparent="yes" />
- <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Please choose where to install the Shibboleth SP and other installation options" Transparent="yes" />
- <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
-
- <!-- Buttons to control Shibboleth Setup -->
- <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="12" Width="320" Text="The files for [ProductName] will be installed in the following folder." />
-
- <Control Id="DescriptionLine2" Type="Text" X="25" Y="70" Height="12" Width="320" Text="To install into a different folder, click the Browse button, and select another folder." />
-
- <Control Id="DescriptionLine3" Type="Text" X="25" Y="90" Height="24" Width="320" Text="You can choose not to install [ProductName] by clicking Cancel to exit the installer." />
-
- <!-- Where? -->
- <Control Id="Dest" Type="Edit" X="25" Y="115" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
- <Control Id="ChangeFolder" Type="PushButton" X="265" Y="115" Height="17" Width="56" Text="B&rowse...">
- <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1">1</Publish>
- <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
- </Control>
-
- <!-- Service? -->
- <Control Id="InstallShibd" Type="Text" X="25" Y="142" Height="17" Width="195" Text="The Shibboleth Daemon will be installed as a service." />
-
- <!-- IIS7 Plugin -->
- <Control Id="InstallIIS7" Type="CheckBox" X="225" Y="140" Height="17" Width="120" Property="INSTALL_IIS7_PLUGIN" CheckBoxValue="TRUE" Text="Configure IIS support">
- <Condition Action="show">IISMAJORVERSION AND (IISMAJORVERSION <> "#6")</Condition>
- <Condition Action="hide">NOT IISMAJORVERSION OR (IISMAJORVERSION = "#6")</Condition>
- </Control>
-
- <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- </Control>
-
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]">1</Publish>
- <Publish Event="DoAction" Value="WixUIValidatePath">
- NOT WIXUI_DONTVALIDATEPATH
- </Publish>
- <Publish Event="SpawnDialog" Value="InvalidDirDlg">
- NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"
- </Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">
- WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
- </Publish>
- </Control>
-
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- </Dialog>
-
- </UI>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
deleted file mode 100644
index 04a4b1ac..00000000
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- 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" 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="400" Platform="x64" />
-
- <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
-
- <PropertyRef Id="SHIB_OLDVERSION_64" />
- <PropertyRef Id="SHIB_OLDVERSION" />
-
- <Condition Message="Shibboleth requires Windows Vista or later.">NOT VersionNT OR (VersionNT >= 600)</Condition>
- <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
- <Condition Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.">(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
-
- <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
-
- <?include ShibbolethSP-properties.wxi?>
-
- <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
- <Property Id="IS64BITINSTALL" Value="TRUE" />
-
- <UIRef Id="ShibbolethInstallDir" />
-
- <!-- Files -->
- <Directory Id="TARGETDIR" Name="SourceDir">
- <!-- The test bit -->
- <Directory Id="opt" Name="opt">
- <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
- </Directory>
-
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
- <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
- <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" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
- </Directory><!--ProgramFilesFolder-->
-
- <Directory Id="ProgramFiles64Folder" Name="PFiles">
- <!-- 64 bit merge modules notionally go to "Program Files" -->
- <Merge Id="CurlMergeModule_x64" Language="1033" SourceFile="MergeModules\Curl-x64.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x64" Language="1033" SourceFile="MergeModules\FastCGI-x64.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x64" Language="1033" SourceFile="MergeModules\Log4Shib-x64.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSAML-x64.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSSL-x64.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x64" Language="1033" SourceFile="MergeModules\Shibboleth-x64.msm" DiskId="1" />
- <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" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_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" />
- </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" />
- </Component>
- </Directory><!--TARGETDIR-->
-
- <Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
- <MergeRef Id="CurlMergeModule_x86" />
- <?if $(var.FCGI) != "" ?>
- <MergeRef Id="FastCGIMergeModule_x86" />
- <?endif ?>
- <MergeRef Id="Log4ShibMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_schemas" />
- <MergeRef Id="OpenSSLMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_schemas" />
- <MergeRef Id="XercesMergeModule_x86" />
- <MergeRef Id="XmlSecMergeModule_x86" />
- <MergeRef Id="ZlibMergeModule_x86" />
-
- <?if $(var.BuildDebug) != "" ?>
- <MergeRef Id="Microsoft_DebugCRT_x86" />
- <?endif ?>
- <MergeRef Id="Microsoft_CRT_x86" />
-
- <MergeRef Id="CurlMergeModule_x64" />
- <?if $(var.FCGI) != "" ?>
- <MergeRef Id="FastCGIMergeModule_x64" />
- <?endif ?>
- <MergeRef Id="Log4ShibMergeModule_x64" />
- <MergeRef Id="OpenSAMLMergeModule_x64" />
- <MergeRef Id="OpenSSLMergeModule_x64" />
- <MergeRef Id="ShibbolethMergeModule_x64" />
- <MergeRef Id="XercesMergeModule_x64" />
- <MergeRef Id="XmlSecMergeModule_x64" />
- <MergeRef Id="ZlibMergeModule_x64" />
-
- <?if $(var.BuildDebug) != "" ?>
- <MergeRef Id="Microsoft_DebugCRT_x64" />
- <?endif ?>
- <MergeRef Id="Microsoft_CRT_x64" />
-
- <!-- ShibbolethSP-exe-x64-->
-
- <ComponentRef Id="resolvertest64.exe" />
- <ComponentRef Id="mdquery64.exe" />
- <?if $(var.BuildDebug) != "" ?>
- <ComponentRef Id="resolvertest64.exe_debug" />
- <ComponentRef Id="mdquery64.exe_debug" />
- <?endif ?>
-
- <ComponentRef Id="adfs64.so" />
- <ComponentRef Id="adfs_lite64.so" />
- <ComponentRef Id="isapi_shib64.dll" />
- <ComponentRef Id="iis7_shib64.dll" />
- <ComponentRef Id="mod_shib_2264.so" />
- <ComponentRef Id="mod_shib_2464.so" />
- <ComponentRef Id="odbc_store64.so" />
- <ComponentRef Id="plugins64.so" />
- <ComponentRef Id="plugins_lite64.so" />
- <?if $(var.FCGI) != "" ?>
- <ComponentRef Id="shibauthorizer64.exe" />
- <ComponentRef Id="shibresponder64.exe" />
- <?endif ?>
-
- <?if $(var.BuildDebug) != "" ?>
- <ComponentRef Id="adfs64.so_debug" />
- <ComponentRef Id="adfs_lite64.so_debug" />
- <ComponentRef Id="isapi_shib64.dll_debug" />
- <ComponentRef Id="iis7_shib64.dll_debug" />
- <ComponentRef Id="mod_shib_2264.so_debug" />
- <ComponentRef Id="mod_shib_2464.so_debug" />
- <ComponentRef Id="odbc_store64.so_debug" />
- <ComponentRef Id="plugins64.so_debug" />
- <ComponentRef Id="plugins_lite64.so_debug" />
- <?if $(var.FCGI) != "" ?>
- <ComponentRef Id="shibauthorizer64.exe_debug" />
- <ComponentRef Id="shibresponder64.exe_debug" />
- <?endif ?>
-
- <ComponentRef Id="shibd64.exe_debug" />
- <?endif ?>
-
- <!-- ShibbolethSP-registry-x64 -->
- <ComponentRef Id="TargetDir64" />
- <ComponentRef Id="Install32Bit64" />
- <ComponentRef Id="shib64.ico" />
-
- <!-- ShibbolethSP-main-x64 -->
- <ComponentRef Id="SetPath" />
- <ComponentRef Id="SetPath64" />
-
- <?include ShibbolethSP-defs-x86.wxi ?>
-
- <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
- </Component>
-
- <Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Win64="yes" Directory="sbin64">
- <File KeyPath="yes" Checksum="yes" Id="shibd64.exe" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Id="shibd64.pdb" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.pdb" />
- <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
- <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth 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" Remove="uninstall" Start="install" Wait="no" />
- <!-- We put in the messages for Isapi and Shibd in this module since all others are shared with x64 -->
- <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
- <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
- <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
- <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFiles64Folder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFiles64Folder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- </RegistryKey>
- </Component>
-
- </Feature>
-
- <!-- Also put in the configuration for IIS7 - There is a difference between 32 and 64 bit dlls and
- between 32 and 64 bit registration -->
-
- <CustomAction Id="SetQtInstallIIS32" Property="QtInstallIIS32" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative32 /image:"[#iis7_shib.dll]" /precondition:"bitness32"" />
- <CustomAction Id="SetQtInstallIIS64" Property="QtInstallIIS64" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib64.dll]" /precondition:"bitness64"" />
- <CustomAction Id="QtInstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtInstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
-
- <!-- Uninstall -->
- <CustomAction Id="SetQtUninstallIIS32" Property="QtUninstallIIS32" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative32" />
- <CustomAction Id="SetQtUninstallIIS64" Property="QtUninstallIIS64" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
- <CustomAction Id="QtUninstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
- <CustomAction Id="QtUninstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
-
- <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore"/>
-
- <InstallExecuteSequence>
- <!-- Install IIS if
- - this is an install
- - AND we were told to
- - AND this is NOT an upgrade
- -->
- <Custom Action="SetQtInstallIIS32" Before="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="SetQtInstallIIS64" After="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS32" After="SetQtInstallIIS32">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS64" After="SetQtInstallIIS64">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
-
- <Custom Action="SetQtUninstallIIS32" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="SetQtUninstallIIS64" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="QtUninstallIIS32" After="SetQtUninstallIIS32">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="QtUninstallIIS64" After="SetQtUninstallIIS64">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <ScheduleReboot Before="InstallFinalize">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </ScheduleReboot>
- </InstallExecuteSequence>
- </Product>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
deleted file mode 100644
index d28976e8..00000000
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <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" Manufacturer="Shibboleth Consortium" InstallerVersion="400" />
-
- <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
-
- <PropertyRef Id="SHIB_OLDVERSION" />
-
- <Condition Message="Shibboleth requires Windows Vista or later.">NOT VersionNT OR (VersionNT >= 600)</Condition>
- <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
- <Condition Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.">(SHIB_OLDVERSION = "none")</Condition>
-
- <Condition Message="For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults">NOT VersionNT64</Condition>
-
- <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
-
- <?include ShibbolethSP-properties.wxi?>
-
- <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
- <Property Id="IS64BITINSTALL" Value="FALSE" />
-
- <UIRef Id="ShibbolethInstallDir" />
-
- <!-- Files -->
- <Directory Id="TARGETDIR" Name="SourceDir">
- <!-- The test bit -->
- <Directory Id="opt" Name="opt">
- <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
- </Directory>
-
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
- <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
- <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" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
- </Directory><!--ProgramFilesFolder-->
-
- <Component Id="SetPath" Guid="{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}">
- <Environment Id="SetPath" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFilesFolder]Shibboleth\SP\lib" />
- </Component>
- </Directory><!--TARGETDIR-->
-
- <Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
- <MergeRef Id="CurlMergeModule_x86" />
- <?if $(var.FCGI) != "" ?>
- <MergeRef Id="FastCGIMergeModule_x86" />
- <?endif ?>
- <MergeRef Id="Log4ShibMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_schemas" />
- <MergeRef Id="OpenSSLMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_schemas" />
- <MergeRef Id="XercesMergeModule_x86" />
- <MergeRef Id="XmlSecMergeModule_x86" />
- <MergeRef Id="ZlibMergeModule_x86" />
-
- <?if $(var.BuildDebug) != "" ?>
- <MergeRef Id="Microsoft_DebugCRT_x86" />
- <?endif ?>
- <MergeRef Id="Microsoft_CRT_x86" />
-
- <!-- ShibbolethSP-main-x86 -->
- <ComponentRef Id="SetPath" />
-
- <?include ShibbolethSP-defs-x86.wxi ?>
-
- <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
- <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
- <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth 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" Remove="uninstall" Start="install" Wait="no" />
- <!-- We put in the messages for Isapi and Shibd in this module since all others are shared with x64 -->
- <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
- <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
- <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
- <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- </RegistryKey>
- </Component>
- </Feature>
-
- <!-- Also put in the configuration for IIS7 - There is a difference between 32 and 64 bit dlls and
- between 32 and 64 bit registration -->
-
- <CustomAction Id="SetQtInstallIIS" Property="QtInstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib.dll]"" />
- <CustomAction Id="QtInstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetQtUninstallIIS" Property="QtUninstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
- <CustomAction Id="QtUninstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
-
- <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore"/>
-
- <InstallExecuteSequence>
- <!-- Install IIS if
- - this is an install
- - AND we were told to
- - AND this is NOT an upgrade
- -->
- <Custom Action="SetQtInstallIIS" Before="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS" After="SetQtInstallIIS">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
-
- <Custom Action="SetQtUninstallIIS" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <Custom Action="QtUninstallIIS" After="SetQtUninstallIIS">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <ScheduleReboot Before="InstallFinalize">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </ScheduleReboot>
- </InstallExecuteSequence>
- </Product>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
deleted file mode 100644
index c825ed4f..00000000
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!--
- This is where we put all the architecture neutral bits of the
- Shibboleth install. It turns out that it may not be all the
- architecture insenstive stuff since some GUIDS may have moved
- -->
- <Fragment>
- <!-- SPCPP-985 -->
- <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
- <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" />
- <PropertyRef Id="WIX_ACCOUNT_USERS" />
-
- <!-- Files First -->
- <!-- Configuration, licenses and documentation -->
-
- <DirectoryRef Id="INSTALLDIR">
- <Component Id="ProtectInstallDir" Guid="{9F695B93-0575-4D91-9E22-35A8D6966F1B}">
- <Condition>NOT WIX_UPGRADE_DETECTED</Condition>
- <CreateFolder>
- <Permission User="[WIX_ACCOUNT_ADMINISTRATORS]" GenericAll="yes" />
- <Permission User="[WIX_ACCOUNT_LOCALSYSTEM]" GenericAll="yes" />
- <Permission User="[WIX_ACCOUNT_USERS]" ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
- <Permission User="[WEBSERVER_USER]" ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </CreateFolder>
- </Component>
- <Directory Id="doc" Name="doc">
- <Directory Id="doc_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\doc">
- <Component Id="main.css" Guid="{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}">
- <File KeyPath="yes" Name="main.css" />
- </Component>
- <Component Id="CREDITS.txt" Guid="{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}">
- <File KeyPath="yes" Name="CREDITS.txt" />
- </Component>
- <Component Id="LICENSE.txt" Guid="{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}">
- <File KeyPath="yes" Name="LICENSE.txt" />
- </Component>
- <Component Id="NOTICE.txt" Guid="{80619251-6754-480A-AFAA-D7398482053C}">
- <File KeyPath="yes" Name="NOTICE.txt" />
- </Component>
- <Component Id="README.txt" Guid="{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}">
- <File KeyPath="yes" Name="README.txt" />
- </Component>
- <Component Id="RELEASE.txt" Guid="{5822AF4E-BE53-4952-B662-6BE2D3913D31}">
- <File KeyPath="yes" Name="RELEASE.txt" />
- </Component>
- </Directory><!-- doc_shibboleth -->
- </Directory><!-- doc -->
- <Directory Id="etc" Name="etc">
- <Directory Id="etc_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\configs">
- <Component Id="example_metadata.xml" Guid="{D9852008-249D-405D-8059-5DAD307D2723}" Permanent="yes">
- <File KeyPath="yes" Name="example-metadata.xml" />
- </Component>
- <Component Id="example_shibboleth2.xml" Guid="{85415A41-2B4E-406F-9CFC-63CFC360A9C7}" Permanent="yes">
- <File KeyPath="yes" Name="example-shibboleth2.xml" />
- </Component>
- <Component Id="keygen.bat" Guid="{A5BBCB8B-42B3-4402-B66D-66D2971F509F}">
- <File KeyPath="yes" Name="keygen.bat" />
- </Component>
- <Component Id="seckeygen.bat" Guid="{63B412FB-9761-47F4-B7E4-B69E11B831A9}">
- <File KeyPath="yes" Name="seckeygen.bat" />
- </Component>
- <Directory Id="etc_shibboleth_dist" Name="dist" FileSource="$(var.SPBuildDirectory)\cpp-sp\configs">
- <Component Id="apache.config.in" Guid="{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}">
- <File KeyPath="yes" Name="apache.config.in" />
- </Component>
- <Component Id="apache2.config.in" Guid="{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}">
- <File KeyPath="yes" Name="apache2.config.in" />
- </Component>
- <Component Id="apache22.config.in" Guid="{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}">
- <File KeyPath="yes" Name="apache22.config.in" />
- </Component>
- <Component Id="apache24.config.in" Guid="{3562B68A-E54A-4F1B-9F10-BDACB5FFE8CB}">
- <File KeyPath="yes" Name="apache24.config.in" />
- </Component>
- <Component Id="sslError.html" Guid="{A74BA230-C49F-4151-BBF4-AA80D554D099}">
- <File KeyPath="yes" Name="sslError.html" />
- </Component>
- <Component Id="bindingTemplate.html" Guid="{F5A3A434-9209-43EC-9314-1F705055DDEC}">
- <File KeyPath="yes" Name="bindingTemplate.html" />
- </Component>
- <Component Id="globalLogout.html" Guid="{E65F580D-5489-4D79-A8FC-F9FFED666FC1}">
- <File KeyPath="yes" Name="globalLogout.html" />
- </Component>
- <Component Id="localLogout.html" Guid="{70FA3A47-A950-4074-BC13-C56D94497BD9}">
- <File KeyPath="yes" Name="localLogout.html" />
- </Component>
- <Component Id="attribute_map.xml" Guid="{878C9456-E65F-4541-A0FA-975379EAC6B6}">
- <File KeyPath="yes" Name="attribute-map.xml" />
- </Component>
- <Component Id="attribute_policy.xml" Guid="{55B88F7B-E2EA-4B70-87B7-33C566B9F992}">
- <File KeyPath="yes" Name="attribute-policy.xml" />
- </Component>
- <Component Id="shibboleth2.xml" Guid="{E520FEDE-3F0E-47C6-9345-47223B82825A}">
- <File KeyPath="yes" Name="shibboleth2.xml" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml" />
- </Component>
- <Component Id="console.logger" Guid="{8AC85980-32B9-4EA2-9245-167FB1AB2570}">
- <File KeyPath="yes" Name="console.logger" />
- </Component>
- <Component Id="discoveryTemplate.html" Guid="{A9573113-4387-46DD-A636-84482AF2C672}">
- <File KeyPath="yes" Name="discoveryTemplate.html" />
- </Component>
- <Component Id="postTemplate.html" Guid="{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}">
- <File KeyPath="yes" Name="postTemplate.html" />
- </Component>
- <Component Id="partialLogout.html" Guid="{E1F6208B-3C70-4632-B84C-C7D141DC4192}">
- <File KeyPath="yes" Name="partialLogout.html" />
- </Component>
- <Component Id="protocols.xml" Guid="{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}">
- <File KeyPath="yes" Name="protocols.xml" />
- </Component>
- <Component Id="security_policy.xml" Guid="{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}">
- <File KeyPath="yes" Name="security-policy.xml" />
- </Component>
- <Component Id="attrChecker.html" Guid="{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}">
- <File KeyPath="yes" Name="attrChecker.html" />
- </Component>
- <Component Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
- <File KeyPath="yes" Name="metadataError.html" />
- </Component>
- <!-- native.logger used to be edited in place so this will never fire, but
- removing this will cause it to go away. So we put it in two places and overwrite
- this with the known good one (via the script) -->
- <Component Id="win_native.logger" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
- <File KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
- </Component>
- <Component Id="win_native.logger_in" Guid="{B081C55E-8C30-4D5D-BAC0-CF0F24026E23}">
- <File KeyPath="yes" Name="win-native.logger" />
- </Component>
- <Component Id="sessionError.html" Guid="{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}">
- <File KeyPath="yes" Name="sessionError.html" />
- </Component>
- <Component Id="shibd.logger.in" Guid="{D8DA3D14-F779-4691-A883-4995158D2A74}">
- <File KeyPath="yes" Name="shibd.logger.in" />
- </Component>
- </Directory><!-- etc_shibboleth_dist -->
- </Directory><!-- etc_shibboleth -->
- </Directory><!-- etc_dist -->
- <Directory Id="var" Name="var">
- <Directory Id="var_cache" Name="cache">
- <Directory Id="var_cache_shibboleth" Name="shibboleth">
- <Component Id="var_cache_shibboleth_folder" Guid="{6C978639-DDCF-40BD-90F8-690B3E05586C}">
- <CreateFolder />
- <!-- Kill off old env variable from pre 2.5 install.
- Do it here so it is in the correct tables -->
- <Environment Id="SHIBSP_SCHEMAS" Action="remove" Name="SHIBSP_SCHEMAS" />
- </Component>
- </Directory><!-- var_cache_shibboleth -->
- </Directory><!-- var_cache -->
- <Directory Id="var_log" Name="log">
- <Directory Id="var_log_shibboleth" Name="shibboleth">
- <Component Id="var_log_shibboleth_folder" Guid="{2BFC84E4-634B-4D70-910A-D5640739C8C8}">
- <CreateFolder />
- </Component>
- </Directory><!-- var_log_shibboleth -->
- </Directory><!-- var_log -->
- <Directory Id="var_run" Name="run">
- <Directory Id="var_run_shibboleth" Name="shibboleth">
- <Component Id="var_run_shibboleth_folder" Guid="{35E176B1-965A-4571-B24E-E0C8E69B0459}">
- <CreateFolder />
- </Component>
- </Directory><!-- var_run_shibboleth -->
- </Directory><!-- var_run -->
- </Directory><!-- var -->
- </DirectoryRef>
-
- <!-- Stuff to do the editing and copy of the files -->
-
- <Binary Id="EditConfigFileSrc" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix" />
-
- <CustomAction Id="EditConfigFiles" BinaryKey="EditConfigFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetEditConfigFiles" Property="EditConfigFiles" Value="[INSTALLDIR];@;[IS64BITINSTALL]" />
-
- <CustomAction Id="KeyGenSigning" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetKeyGenSigning" Property="KeyGenSigning" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-signing [KEYGEN_EXTRA]" />
-
- <CustomAction Id="KeyGenEncrypt" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetKeyGenEncrypt" Property="KeyGenEncrypt" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-encrypt [KEYGEN_EXTRA]" />
-
- <CustomAction Id="SetSetDisplayName" Property="SetDisplayName" Value=""[WindowsFolder]\System32\sc" config shibd_default DisplayName= "Shibboleth Daemon (Default)"" />
-
- <!-- Inherit the installation dir if one was set -->
- <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
- <CustomAction Id="InheritInstallDir64" Property="INSTALLDIR" Value="[OLD_INSTALLDIR64]" />
-
- <!-- Identity to give Read access to -->
- <Property Id="WEBSERVER_USER"/>
-
- <CustomAction Id="DefaultWebServerUser" Property="WEBSERVER_USER" Value="[WIX_ACCOUNT_USERS]" />
-
- <InstallUISequence>
- <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
-
- <!-- inherit installationDir if there is something to inherit -->
- <Custom Action="InheritInstallDir" After="AppSearch">
- OLD_INSTALLDIR
- </Custom>
- <Custom Action="InheritInstallDir64" After="InheritInstallDir">
- (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
- </Custom>
- </InstallUISequence>
-
- <InstallExecuteSequence>
- <Custom Action="SetEditConfigFiles" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="EditConfigFiles" After="InstallFiles">NOT Installed</Custom>
-
- <Custom Action="SetKeyGenSigning" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
- <Custom Action="SetKeyGenEncrypt" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
-
- <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
- <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
- <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
-
- <!-- Set name only on upgrade and after ServiceInstall -->
- <Custom Action="SetSetDisplayName" Before="CostInitialize">ALREADYINSTALLED</Custom>
- <Custom Action="SetDisplayName" After="InstallServices">ALREADYINSTALLED</Custom>
-
- <!-- Duplicate actions from the UI case -->
- <Custom Action="InheritInstallDir" After="AppSearch">
- OLD_INSTALLDIR
- </Custom>
- <Custom Action="InheritInstallDir64" After="InheritInstallDir">
- (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
- </Custom>
-
- <!-- Do not mess with SCM if this is an upgrade -->
-
- <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>
- <StartServices>(NOT Installed) AND (ALWAYS_START_SERVICE = "TRUE")</StartServices>
- <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
-
- <!-- Setup the WEBUSER -->
- <Custom Action="DefaultWebServerUser" After="InstallInitialize">WEBSERVER_USER = ""</Custom>
-
- </InstallExecuteSequence>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
deleted file mode 100644
index 4b1f9bf4..00000000
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<!-- This is where we put all the configuration properties we will
- used to drive the install. The GUI will change them as required,
- but the GUI is not required. -->
-
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-
- <!-- Are we installing IIS, if so what extension to used -->
- <Property Id="INSTALL_IIS_PLUGIN" Value="TRUE" Secure="yes" />
-
- <!-- Information for the properties page of the msi -->
-
- <Property Id="ARPCONTACT" Value="contact at shibboleth.net" />
- <Property Id="ARPHELPLINK" Value="https://wiki.shibboleth.net/confluence/display/SP3/" />
- <Property Id="ARPURLUPDATEINFO" Value="https://wiki.shibboleth.net/confluence/display/SP3/" />
- <Property Id="ARPURLINFOABOUT" Value="http://shibboleth.net/" />
-
- <!-- Do we want to force the ServiceStart to happen? -->
- <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
-
- <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
- <!-- SSPCPP-568 We need a default for InstallDir -->
- <Property Id="INSTALLDIR" Value="C:\opt\shibboleth-sp\" />
- <!-- IISMAJORVERSION if IIS installed -->
- <PropertyRef Id="IISMAJORVERSION" />
-
- <!-- ALREADYINSTALLED if we are doing an upgrade -->
- <Upgrade Id="$(var.ShibbolethUpgradeCode)">
- <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="127.255.255" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED" />
- </Upgrade>
-</Include>
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
deleted file mode 100644
index 634b6123..00000000
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!--
- This is where we put all the architecture neutral bits of the
- Shibboleth install. It turns out that it may not be all the
- architecture insensitive stuff since some GUIDS may have moved
- -->
- <Fragment>
-
- <!-- Previous version search -->
- <Property Id="SHIB_OLDVERSION_64" Value="none" Secure="yes">
- <RegistrySearch Id="SP_2_2_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_2_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP_2_4_3_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_3_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}" Name="DisplayName" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_1_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_2_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_3_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}" Name="DisplayVersion" Type="raw" Win64="yes" />
- </Property>
-
- <Property Id="OLD_INSTALLDIR64" Secure="yes">
- <RegistrySearch Id="OldInstallDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Type="directory" Win64="yes" />
- </Property>
-
- <!-- 64 bit only -->
- <Property Id="OLD_INSTALL_32BIT" Secure="yes">
- <RegistrySearch Id="OldInstall32Bit" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Type="raw" Win64="yes" />
- </Property>
-
- <DirectoryRef Id="bin64">
- <!-- Save the Captured parameters into the registry -->
- <Component Id="TargetDir64" Guid="{E89D3028-5415-4874-9CBC-806A2064C613}" Win64="yes">
- <RegistryValue Id="TargetDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
- </Component>
-
- <Component Id="Install32Bit64" Guid="{9A0181FE-6252-4C2E-8828-70281DCC3825}" Win64="yes">
- <RegistryValue Id="Install32Bit64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Value="[INSTALL_32BIT]" Type="string" KeyPath="yes" />
- </Component>
-
- <Component Id="shib64.ico" Guid="{AB12F477-E49D-4E52-B130-AF0913AF9EC9}" Win64="yes" Permanent="yes">
- <File Id="shib64.ico" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico" />
- <RegistryValue Id="DisplayIcon64" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib64.ico],0" Type="string" />
- </Component>
- </DirectoryRef>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
deleted file mode 100644
index 617e03a8..00000000
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!--
- This is where we put all the architecture neutral bits of the
- Shibboleth install. It turns out that it may not be all the
- architecture insensitive stuff since some GUIDS may have moved
- -->
- <Fragment>
- <!-- Previous version search -->
- <Property Id="SHIB_OLDVERSION" Value="none" Secure="yes">
- <RegistrySearch Id="SP2_2_1" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_4_1_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_4_2_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_4_3_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_2_0_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_3_0_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_1_0_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="AppReg2" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_4_0_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}" Name="DisplayName" Type="raw" />
- <RegistrySearch Id="AppReg1" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_0_0_32" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}" Name="DisplayVersion" Type="raw" />
- <RegistrySearch Id="SP2_3_1" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}" Name="DisplayVersion" Type="raw" />
- </Property>
-
- <Property Id="OLD_INSTALLDIR" Secure="yes">
- <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Type="directory" />
- </Property>
-
- <!-- non virtualized registry setting -->
- <Property Id="OLD_SERVICEINSTALLED" Secure="yes">
- <RegistrySearch Id="OldServiceInstalled" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\shibd_Default" Name="ImagePath" Type="raw" />
- </Property>
-
- <DirectoryRef Id="bin">
- <!-- Save the Captured parameters into the registry -->
- <Component Id="TargetDir" Guid="{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}">
- <RegistryValue Id="TargetDir" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
- </Component>
-
- <!-- pretty icon for the "install programs" page -->
- <Component Id="shib.ico" Guid="{FA0F86A1-0731-4D66-8216-BC74D231B598}">
- <File KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico" />
- <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
- </Component>
- </DirectoryRef>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-update-dlg.wxs b/msi/WiX/ShibbolethSP-update-dlg.wxs
deleted file mode 100644
index 2b023e55..00000000
--- a/msi/WiX/ShibbolethSP-update-dlg.wxs
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- The dialog to display if we sense an upgrade -->
- <Fragment>
-
- <UI>
- <Dialog Id="UpdateDlgShib" Width="370" Height="270" Title="[ProductName] Update">
- <!-- Stuff at the top: picture, some text, a line -->
- <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
- <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Update Shibboleth" Transparent="yes" />
- <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Update to [ProductName]" Transparent="yes" />
- <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
-
- <!-- Buttons to control Shibboleth Setup -->
- <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="12" Width="320" Text="The updated files for [ProductName] will be installed to [INSTALLDIR]" />
-
- <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
- </Control>
-
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="VerifyReadyDlg" />
- </Control>
-
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- </Dialog>
- </UI>
- </Fragment>
-</Wix>
diff --git a/msi/WiX/TopBanner.bmp b/msi/WiX/TopBanner.bmp
deleted file mode 100644
index b2082d90..00000000
Binary files a/msi/WiX/TopBanner.bmp and /dev/null differ
diff --git a/msi/WiX/license.rtf b/msi/WiX/license.rtf
deleted file mode 100644
index d7480550..00000000
--- a/msi/WiX/license.rtf
+++ /dev/null
@@ -1,38 +0,0 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang2057\deflangfe2057{\fonttbl{\f0\fswiss\fprq2\fcharset0 Helvetica;}{\f1\fmodern\fprq1\fcharset0 Courier New;}{\f2\fswiss\fprq2\fcharset0 Calibri;}}
-{\colortbl ;\red51\green51\blue51;\red0\green0\blue255;\red62\green79\blue144;\red255\green255\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cbpat4\sl276\slmult1\cf1\f0\fs20 Apache License\line\line Version 2.0, January 2004\line\line\pard\sl276\slmult1\cf0\b{\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/"}}{\fldrslt{\ul\cf2 http://www.apache.org/licenses/}}}\cf1\b0\f0\fs20\par
-\pard\cbpat4\sl276\slmult1 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
-\cf3\b 1. Definitions\cf1\b0 .\par
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\par
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\par
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\par
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.\par
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\par
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\par
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\par
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\par
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or it [...]
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\par
-\cf3\b 2. Grant of Copyright License\cf1\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\par
-\cf3\b 3. Grant of Patent License\cf1\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alo [...]
-\cf3\b 4. Redistribution\cf1\b0 . You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\par
-\pard\sl276\slmult1\tx720 1.\tab You must give any other recipients of the Work or Derivative Works a copy of this License; and\par
-\pard\sl276\slmult1 2.\tab You must cause any modified files to carry prominent notices stating that You changed the files; and\par
-3.\tab You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\par
-4.\tab If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works [...]
-\pard\cbpat4\sl276\slmult1\cf3\b 5. Submission of Contributions\cf1\b0 . Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\par
-\cf3\b 6. Trademarks\cf1\b0 . This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\par
-\cf3\b 7. Disclaimer of Warranty\cf1\b0 . Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or red [...]
-\cf3\b 8. Limitation of Liability\cf1\b0 . In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (includin [...]
-\cf3\b 9. Accepting Warranty or Additional Liability\cf1\b0 . While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold eac [...]
-END OF TERMS AND CONDITIONS\par
-\kerning36\b\fs32 APPENDIX: How to apply the Apache License to your work\par
-\kerning0\b0\fs20 To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.\par
-\pard\sl276\slmult1\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f1\fs23\par
- Copyright [yyyy] [name of copyright owner]\par
- Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.\par
- You may obtain a copy of the License at\par
- {\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt{\ul\cf2 http://www.apache.org/licenses/LICENSE-2.0}}}\f1\fs23\par
- Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.\cf0\f2\fs20\par
-}
-
\ No newline at end of file
diff --git a/msi/wix6/installer.vcxproj b/msi/installer.vcxproj
similarity index 100%
rename from msi/wix6/installer.vcxproj
rename to msi/installer.vcxproj
diff --git a/msi/wix6/nuget.config b/msi/nuget.config
similarity index 100%
rename from msi/wix6/nuget.config
rename to msi/nuget.config
diff --git a/msi/scripts/shib_edit_catalog.vbs b/msi/scripts/shib_edit_catalog.vbs
deleted file mode 100644
index 7e074c4c..00000000
--- a/msi/scripts/shib_edit_catalog.vbs
+++ /dev/null
@@ -1,54 +0,0 @@
-Function ReadFile( filePath )
- Dim theFile
-
- 'OpenTextFile args: <path>, 1 = ForReading
- 'If you read an empty file, VBScript throws an error for some reason
-
- if (FileSystemObj.FileExists(filePath)) then
- Set theFile = FileSystemObj.GetFile(filePath)
- if (theFile.size > 0) then
- Set theFile = FileSystemObj.OpenTextFile(filePath, 1)
- ReadFile = theFile.ReadAll
- else
- ReadFile = ""
- end if
- else
- ReadFile = ""
- end if
-End Function
-
-Sub WriteFile( filePath, contents )
- Dim theFile
-
- 'OpenTextFile args: <path>, 2 = ForWriting, True = create if not exist
- Set theFile = FileSystemObj.OpenTextFile(filePath, 2, True)
- theFile.Write contents
-End Sub
-
-Sub ReplaceInFile( filePath, lookForStr, replaceWithStr )
- Dim buffer
- inpath = filePath & ".in"
-
- buffer = ReadFile(inpath)
- if (buffer <> "") then
- buffer = Replace(buffer, lookForStr, replaceWithStr)
- WriteFile filePath, buffer
-
- end if
-End Sub
-
-
-Dim FileSystemObj, ConfigFile, ConfigFileName, XMLDir, WshShell
-
-on error resume next
-Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
-if (Err = 0) then
- 'Get the parameters via CustomActionData
- customData = Session.Property("CustomActionData")
- msiProperties = split(customData,";@;")
- XMLDir = msiProperties(0) ' \programdata\shibboleth\sp\xml\opensaml\
- ConfigFile = msiProperties(1) 'catalog
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
-
-'Last End If
-End If
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
deleted file mode 100644
index a27e0df8..00000000
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ /dev/null
@@ -1,209 +0,0 @@
-Function ReadFile( filePath )
- Dim theFile
-
- 'OpenTextFile args: <path>, 1 = ForReading
- 'If you read an empty file, VBScript throws an error for some reason
- if (FileSystemObj.FileExists(filePath)) then
- Set theFile = FileSystemObj.GetFile(filePath)
- if (theFile.size > 0) then
- Set theFile = FileSystemObj.OpenTextFile(filePath, 1)
- ReadFile = theFile.ReadAll
- else
- ReadFile = ""
- end if
- else
- ReadFile = ""
- end if
-End Function
-
-Sub WriteFile( filePath, contents )
- Dim theFile
-
- 'OpenTextFile args: <path>, 2 = ForWriting, True = create if not exist
- Set theFile = FileSystemObj.OpenTextFile(filePath, 2, True)
- theFile.Write contents
-End Sub
-
-Sub ReplaceInFile( filePath, lookForStr, replaceWithStr )
- Dim buffer
-
- buffer = ReadFile(filePath)
- if (buffer <> "") then
- buffer = Replace(buffer, lookForStr, replaceWithStr)
- WriteFile filePath, buffer
- end if
-End Sub
-
-
-Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir, WshShell
-Dim customData, msiProperties, InstallDir, LibDir, Is64Bit, LogFile
-
-on error resume next
-Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
-if (Err = 0) then
-
- 'Get the INSTALLDIR and 64/32 values via CustomActionData
- customData = Session.Property("CustomActionData")
- msiProperties = split(customData,";@;")
- InstallDir = msiProperties(0)
- Is64Bit = msiProperties(1)
-
- LibDir = "lib"
- If (Is64Bit = "TRUE") then
- LibDir = "lib64"
- End If
-
- Set LogFile = FileSystemObj.OpenTextFile(InstallDir & "\var\log\shibboleth\Installer.log", 8, true)
-
- If (LogFile) then
- LogFile.WriteLine "Edit Config Files to " & InstallDir & ", 64Bit = " & Is64Bit
- End If
-
- 'Remove all trailing backslashes to normalize
- do while (mid(InstallDir,Len(InstallDir),1) = "\")
- InstallDir = mid(InstallDir,1,Len(InstallDir)-1)
- loop
- ConvertedDir = Replace(InstallDir, "\", "/")
- ConfigDir = InstallDir & "\etc\shibboleth\"
- DistDir = ConfigDir & "dist\"
-
- 'Set ConvertedDir as the SHIBSP_PREFIX system variable.
- Set WshShell = CreateObject("WScript.Shell")
- WshShell.RegWrite "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\SHIBSP_PREFIX", ConvertedDir, "REG_SZ"
-
- 'Blow away any old SHIBSPP_SCHEMAS variable we find
- WshShell.RegDelete "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\SHIBSP_SCHEMAS"
-
- 'Perform actual Substitutions
- 'Afterwards, if the config file doesn't already exist, copy up to etc/shibboleth
- 'Also strip *.in for files in dist
-
- ConfigFile = DistDir & "shibd.logger.in"
- ReplaceInFile ConfigFile, "@-PKGLOGDIR-@", ConvertedDir & "/var/log/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibd.logger")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibd.logger", false
- End If
- If (FileSystemObj.FileExists(DistDir & "shibd.logger")) then
- FileSystemObj.DeleteFile DistDir & "shibd.logger", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "shibd.logger"
-
- ConfigFile = DistDir & "apache.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache.config")) then
- FileSystemObj.DeleteFile DistDir & "apache.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache.config"
-
- ConfigFile = DistDir & "apache2.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache2.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache2.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache2.config")) then
- FileSystemObj.DeleteFile DistDir & "apache2.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache2.config"
-
- ConfigFile = DistDir & "apache22.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache22.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache22.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache22.config")) then
- FileSystemObj.DeleteFile DistDir & "apache22.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"
-
- ConfigFile = DistDir & "apache24.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache24.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache24.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache24.config")) then
- FileSystemObj.DeleteFile DistDir & "apache24.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache24.config"
-
- 'Now just copy the other non-edited files over as well (if possible)
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
- FileSystemObj.CopyFile DistDir & "shibboleth2.xml", ConfigDir, false
- End If
-
- ' native.logger used to be edited in place, so we cannot update it
- ' copy it from a known good place
- FileSystemObj.CopyFile DistDir & "win-native.logger", DistDir & "native.logger", true
- If (NOT FileSystemObj.FileExists(ConfigDir & "native.logger")) then
- FileSystemObj.CopyFile DistDir & "native.logger", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "metadataError.html")) then
- FileSystemObj.CopyFile DistDir & "metadataError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "sessionError.html")) then
- FileSystemObj.CopyFile DistDir & "sessionError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "sslError.html")) then
- FileSystemObj.CopyFile DistDir & "sslError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "bindingTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "bindingTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "discoveryTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "discoveryTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "postTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "postTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "localLogout.html")) then
- FileSystemObj.CopyFile DistDir & "localLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "globalLogout.html")) then
- FileSystemObj.CopyFile DistDir & "globalLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "partialLogout.html")) then
- FileSystemObj.CopyFile DistDir & "partialLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "console.logger")) then
- FileSystemObj.CopyFile DistDir & "console.logger", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth.logger")) then
- FileSystemObj.CopyFile DistDir & "shibboleth.logger", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-map.xml")) then
- FileSystemObj.CopyFile DistDir & "attribute-map.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-policy.xml")) then
- FileSystemObj.CopyFile DistDir & "attribute-policy.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "security-policy.xml")) then
- FileSystemObj.CopyFile DistDir & "security-policy.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "protocols.xml")) then
- FileSystemObj.CopyFile DistDir & "protocols.xml", ConfigDir, false
- End If
-
-'Last End If
-End If
\ No newline at end of file
diff --git a/msi/wix6/sp4.wxs b/msi/sp4.wxs
similarity index 100%
rename from msi/wix6/sp4.wxs
rename to msi/sp4.wxs
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list