[cpp-sp] 01/02: Wixcop the WiX sources
Rod Widdowson
rdw at steadingsoftware.com
Thu Mar 15 10:52:18 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a11643d85bf1c7bdbdea288d1ac53e84d66f4421
commit a11643d85bf1c7bdbdea288d1ac53e84d66f4421
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Mar 15 14:33:07 2018 +0000
Wixcop the WiX sources
Run wixcopy over the WiX sources to do a one off cleanup.
A Functional no-op, this ends up using " rather than ' for attributes
so any future wixcop-ification will be quiet
---
msi/WiX/MergeModules/Curl-x64.wxs | 48 ++---
msi/WiX/MergeModules/Curl-x86.wxs | 48 ++---
msi/WiX/MergeModules/FastCGI-x64.wxs | 39 ++--
msi/WiX/MergeModules/FastCGI-x86.wxs | 39 ++--
msi/WiX/MergeModules/Log4Shib-x64.wxs | 44 ++--
msi/WiX/MergeModules/Log4Shib-x86.wxs | 44 ++--
msi/WiX/MergeModules/OpenSAML-schemas.wxs | 306 +++++++++++++--------------
msi/WiX/MergeModules/OpenSAML-x64.wxs | 66 +++---
msi/WiX/MergeModules/OpenSAML-x86.wxs | 66 +++---
msi/WiX/MergeModules/OpenSSL-x64.wxs | 52 +++--
msi/WiX/MergeModules/OpenSSL-x86.wxs | 52 +++--
msi/WiX/MergeModules/Shibboleth-schemas.wxs | 82 ++++----
msi/WiX/MergeModules/Shibboleth-x64.wxs | 46 ++--
msi/WiX/MergeModules/Shibboleth-x86.wxs | 46 ++--
msi/WiX/MergeModules/Xerces-x64.wxs | 37 ++--
msi/WiX/MergeModules/Xerces-x86.wxs | 37 ++--
msi/WiX/MergeModules/XmlSec-x64.wxs | 87 ++++----
msi/WiX/MergeModules/XmlSec-x86.wxs | 87 ++++----
msi/WiX/MergeModules/Zlib-x64.wxs | 32 ++-
msi/WiX/MergeModules/Zlib-x86.wxs | 32 ++-
msi/WiX/ShibbolethSP-defs-x86.wxi | 8 +-
msi/WiX/ShibbolethSP-exe-x64.wxs | 132 ++++++------
msi/WiX/ShibbolethSP-exe-x86.wxs | 142 ++++++-------
msi/WiX/ShibbolethSP-gui.wxs | 94 ++++-----
msi/WiX/ShibbolethSP-install-dlg.wxs | 64 +++---
msi/WiX/ShibbolethSP-main-x64.wxs | 311 ++++++++++++++--------------
msi/WiX/ShibbolethSP-main-x86.wxs | 172 +++++++--------
msi/WiX/ShibbolethSP-noarch.wxs | 197 +++++++++---------
msi/WiX/ShibbolethSP-properties.wxi | 24 +--
msi/WiX/ShibbolethSP-registry-x64.wxs | 71 +++----
msi/WiX/ShibbolethSP-registry-x86.wxs | 78 +++----
msi/WiX/ShibbolethSP-update-dlg.wxs | 33 ++-
32 files changed, 1225 insertions(+), 1391 deletions(-)
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 313d80b..92e7553 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -22,39 +22,33 @@
<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<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='300' Platform='x64'/>
+<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="300" 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'/>
+ <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" />
</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 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>
- <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'/>
+ <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" />
</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 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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index c0f4fc1..76ca7cc 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -21,39 +21,33 @@
<?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"?>
-<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='300'/>
+<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="300" />
- <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'/>
+ <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" />
</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 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>
- <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'/>
+ <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" />
</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 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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 7e542bb..3331b19 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,32 +16,27 @@
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='300' Platform='x64'/>
+<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="300" 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' />
+ <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>
- <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' />
+ <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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 41456cd..5e5e96c 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,32 +16,27 @@
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='300' Platform='x86'/>
+<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="300" 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' />
+ <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>
- <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' />
+ <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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 957255c..9b48715 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,35 +16,33 @@
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='300' Platform='x64'/>
+<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="300" 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'/>
+ <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" />
</Component>
- <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+ <Component Id="NTEventLogAppender.dll" Guid="{1A559035-DCA4-4297-AE94-C3E6ABB37662}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
- <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'/>
+ <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" />
</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 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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 904024d..6ba9390 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,35 +16,33 @@
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='300' Platform='x86'/>
+<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="300" 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'/>
+ <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" />
</Component>
- <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
- <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+ <Component Id="NTEventLogAppender.dll" Guid="{43B944CB-E42A-4D17-A601-AC4E14DA2217}">
+ <File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
- <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'/>
+ <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" />
</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 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-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index eca7bf7..72d6b8b 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,200 +16,198 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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='300' Platform='x86'/>
+ <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="300" 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'/>
+ <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 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 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 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 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='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 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='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 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='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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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' />
+ <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 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 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 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 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 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 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 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>
</Directory><!-- xmltooling -->
</Directory><!-- xml -->
@@ -217,32 +215,24 @@
</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' />
+ <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>
+ <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>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 910b8c9..c35bba8 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,51 +16,47 @@
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='300' Platform='x64'/>
+<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="300" 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' />
+ <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" />
</Component>
- <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
+ <Component Id="samlsign.exe" Guid="{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
</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' />
+ <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" />
</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' />
+ <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" />
</Component>
- <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' />
+ <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" />
</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' />
+ <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" />
</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' />
+ <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" />
</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' />
+ <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" />
</Component>
</Directory><!-- lib_debug -->
</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' />
+ <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-->
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index be93d02..bbda73c 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,51 +16,47 @@
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='300' Platform='x86'/>
+<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="300" 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' />
+ <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" />
</Component>
- <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
- <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
+ <Component Id="samlsign.exe" Guid="{3DC7A431-9623-4283-BA07-444DB1C1F864}">
+ <File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
</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' />
+ <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" />
</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' />
+ <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" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
- <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+ <Component Id="samlsign.exe_debug" Guid="{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}">
+ <File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
</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' />
+ <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" />
</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' />
+ <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" />
</Component>
</Directory><!-- lib_debug -->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 3593aac..7c901d4 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -23,40 +23,38 @@
<?define SslEay="libssl-$(var.OpenSSLFileVersion)-x64.dll"?>
<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D-x64.dll"?>
-<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='300' 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)' />
+<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="300" 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)" />
</Component>
- <Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='$(var.SslEay)' />
+ <Component Id="ssleay32.dll" Guid="$(var.SSlEay64Component)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
</Component>
- <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+ <Component Id="openssl.exe" Guid="{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
- <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)' />
+ <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)" />
</Component>
- <Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='$(var.SslEayD)' />
+ <Component Id="ssleay32D.dll" Guid="$(var.SSlEay64Componentd)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
</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 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-->
</Directory><!-- lib -->
- <Directory Id='doc' Name='doc'>
- <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
- <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\$(var.openssl)\LICENSE' />
+ <Directory Id="doc" Name="doc">
+ <Component Id="OPENSSL.LICENSE" Guid="{10B77A21-E554-47F2-99F0-7171304FE899}" Win64="yes">
+ <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE" />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index b0f2d87..ae80802 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -25,40 +25,38 @@
-<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='300' 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)' />
+<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="300" 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)" />
</Component>
- <Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>
- <File KeyPath='yes' Checksum='yes' Name='$(var.SslEay)' />
+ <Component Id="ssleay32.dll" Guid="$(var.SSlEay32Component)">
+ <File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
</Component>
- <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
- <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+ <Component Id="openssl.exe" Guid="{886F0254-AD10-45C6-A723-37C7FA466651}">
+ <File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
- <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)' />
+ <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)" />
</Component>
- <Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Name='$(var.SslEayD)' />
+ <Component Id="ssleay32D.dll" Guid="$(var.SSlEay32Componentd)">
+ <File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
</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 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-->
</Directory><!-- lib -->
- <Directory Id='doc' Name='doc'>
- <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
- <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\$(var.openssl)\LICENSE' />
+ <Directory Id="doc" Name="doc">
+ <Component Id="OPENSSL.LICENSE" Guid="{CEC1CC66-6D48-475A-8C99-B687B0B901AA}">
+ <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE" />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 6b6e6ac..ea95554 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -15,53 +15,51 @@
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='300' Platform='x86'/>
+<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="300" 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' />
+ <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='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
- <File KeyPath='yes' Name='shibboleth.xsd' />
+ <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 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 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 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 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 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='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
- <File KeyPath='yes' Name='WS-Trust.xsd' />
+ <Component Id="WSTrust.xsd" Guid="{91EA82B5-A19C-40C0-8D1C-40FA020A484E}">
+ <File KeyPath="yes" Name="WS-Trust.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 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 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 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 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>
</Directory><!--xml_shibboleth-->
</Directory><!--xml-->
@@ -69,14 +67,12 @@
</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' />
+ <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>
+ <Custom Action="SetEditShibbolethCatalog" Before="CostInitialize">NOT Installed</Custom>
+ <Custom Action="EditShibbolethCatalog" After="InstallFiles">NOT Installed</Custom>
</InstallExecuteSequence>
</Module>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index ef1cb08..4053ac8 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -15,36 +15,34 @@
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='300' Platform='x64'/>
+<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="300" 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' />
+ <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" />
</Component>
- <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+ <Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite64Component)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
+ <Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite64Componentd)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
</Component>
</Directory><!-- lib_debug -->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 2cfe6c6..47a2648 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -15,36 +15,34 @@
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='300' Platform='x86'/>
+<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="300" 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' />
+ <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" />
</Component>
- <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite32Component)'>
- <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+ <Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite32Component)">
+ <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
+ <Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite32Componentd)">
+ <File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
</Component>
</Directory><!-- lib_debug -->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 82115ad..5123bb4 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,29 +16,26 @@
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='300' 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)'/>
+<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="300" 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)" />
</Component>
- <Directory Id='lib_debug' Name='debug'>
- <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDebugDll)'/>
+ <Directory Id="lib_debug" Name="debug">
+ <Component Id="xercescD.dll" Guid="$(var.Xerces64Componentd)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
</Component>
</Directory><!-- lib_debug-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 4f94862..4270cdb 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,29 +16,26 @@
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='300' 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)'/>
+<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="300" 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)" />
</Component>
- <Directory Id='lib_debug' Name='debug'>
- <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDebugDll)'/>
+ <Directory Id="lib_debug" Name="debug">
+ <Component Id="xercescD.dll" Guid="$(var.Xerces32Componentd)">
+ <File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
</Component>
</Directory><!-- lib_debug-->
</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' />
+ <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 -->
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 1da7ffd..33c7f55 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,67 +16,62 @@
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 Santuario (x64)'
- Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'
- Manufacturer='Shibboleth Consortium' InstallerVersion='300' 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 Minimal'>
- <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+<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 Santuario (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="300" 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 Minimal">
+ <Component Id="xsec.dll" Guid="$(var.XmlSec64Component)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
</Component>
- <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+ <Component Id="c14n.exe" Guid="{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
</Component>
- <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+ <Component Id="checksig.exe" Guid="{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
</Component>
- <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+ <Component Id="cipher.exe" Guid="{192AEEF7-3AE2-4570-AA30-1A2046646A84}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
</Component>
- <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+ <Component Id="siginf.exe" Guid="{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
</Component>
- <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+ <Component Id="templatesign.exe" Guid="{71B603E6-A54B-4843-A4F8-826AD4CA6A04}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
</Component>
- <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+ <Component Id="txfmout.exe" Guid="{2D9025EE-D95F-4D3C-B0E7-86D742749D39}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</Component>
- <Directory Id='lib_debug' Name='debug'
- FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal'>
- <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+ <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal">
+ <Component Id="xsecD.dll" Guid="$(var.XmlSec64Componentd)" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
</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'/>
+ <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" />
</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'/>
+ <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" />
</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'/>
+ <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" />
</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'/>
+ <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" />
</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'/>
+ <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" />
</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'/>
+ <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" />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
- <Directory Id='doc' Name='doc'>
- <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>
- <File KeyPath='yes' Name='SANTUARIO.LICENSE'
- Source='$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt' />
+ <Directory Id="doc" Name="doc">
+ <Component Id="SANTUARIO.LICENSE" Guid="{07288B10-ED5A-443F-BC90-CFD987C798C4}" Win64="yes">
+ <File KeyPath="yes" Name="SANTUARIO.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 693e5e6..3561ffd 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,67 +16,62 @@
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 Santuario (x86)'
- Comments='This module is built by the Shibboleth Consortium. Includes Several executable utilities.'
- Manufacturer='Shibboleth Consortium' InstallerVersion='300' 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 Minimal'>
- <Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>
- <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+<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 Santuario (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="300" 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 Minimal">
+ <Component Id="xsec.dll" Guid="$(var.XmlSec32Component)">
+ <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
</Component>
- <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
- <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+ <Component Id="c14n.exe" Guid="{576EB311-AADA-49D3-B444-7EDC37C715F3}">
+ <File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
</Component>
- <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>
- <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+ <Component Id="checksig.exe" Guid="{F0C2B97A-7B93-4CD3-9432-E5904D337815}">
+ <File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
</Component>
- <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>
- <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+ <Component Id="cipher.exe" Guid="{654BB761-7B9D-4766-AC5F-DC174E7B94AE}">
+ <File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
</Component>
- <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>
- <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+ <Component Id="siginf.exe" Guid="{1B278BD9-6507-4613-9315-8D47CAEBC3D8}">
+ <File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
</Component>
- <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>
- <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+ <Component Id="templatesign.exe" Guid="{A24CD56C-F615-406E-B4E2-4AC5EAE99206}">
+ <File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
</Component>
- <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>
- <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+ <Component Id="txfmout.exe" Guid="{667DD190-335B-4AB7-BBA5-25B5F847F363}">
+ <File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</Component>
- <Directory Id='lib_debug' Name='debug'
- FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal'>
- <Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+ <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal">
+ <Component Id="xsecD.dll" Guid="$(var.XmlSec32Componentd)">
+ <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
</Component>
- <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
- <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+ <Component Id="c14n.exe_debug" Guid="{20506FEA-CCFF-46A2-9753-DBBA8A967003}">
+ <File Id="c14n.exe_debug" KeyPath="yes" Checksum="yes" Name="c14n.exe" />
</Component>
- <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
- <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+ <Component Id="checksig.exe_debug" Guid="{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}">
+ <File Id="checksig.exe_debug" KeyPath="yes" Checksum="yes" Name="checksig.exe" />
</Component>
- <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
- <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+ <Component Id="cipher.exe_debug" Guid="{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}">
+ <File Id="cipher.exe_debug" KeyPath="yes" Checksum="yes" Name="cipher.exe" />
</Component>
- <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
- <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+ <Component Id="siginf.exe_debug" Guid="{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}">
+ <File Id="siginf.exe_debug" KeyPath="yes" Checksum="yes" Name="siginf.exe" />
</Component>
- <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
- <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+ <Component Id="templatesign.exe_debug" Guid="{5E8264B4-D759-4502-B989-5A5C56FBD875}">
+ <File Id="templatesign.exe_debug" KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
</Component>
- <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
- <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+ <Component Id="txfmout.exe_debug" Guid="{FCBFBCAA-5C39-470A-BD58-E558C384898D}">
+ <File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
- <Directory Id='doc' Name='doc'>
- <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>
- <File KeyPath='yes' Name='SANTUARIO.LICENSE'
- Source='$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt' />
+ <Directory Id="doc" Name="doc">
+ <Component Id="SANTUARIO.LICENSE" Guid="{FF81AD29-36DF-42BD-AFC9-211F083D9872}">
+ <File KeyPath="yes" Name="SANTUARIO.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index beca9c0..0282fcb 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?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
@@ -15,25 +15,21 @@
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='300' Platform='x64'/>
+<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="300" 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'/>
+ <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" />
</Component>
- <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'/>
+ <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" />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 396154f..1c04ad8 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?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
@@ -15,25 +15,21 @@
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='300' Platform='x86'/>
+<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="300" 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'/>
+ <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" />
</Component>
- <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'/>
+ <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" />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 1c2ea12..caf14b0 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -53,7 +53,7 @@
<ComponentRef Id="mod_shib_22.so" />
<?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll" />
- <?endif?>
+ <?endif ?>
<ComponentRef Id="mod_shib_24.so" />
<ComponentRef Id="odbc_store.so" />
<ComponentRef Id="plugins.so" />
@@ -61,7 +61,7 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe" />
<ComponentRef Id="shibresponder.exe" />
- <?endif?>
+ <?endif ?>
<ComponentRef Id="adfs.so_debug" />
<ComponentRef Id="adfs_lite.so_debug" />
@@ -70,7 +70,7 @@
<ComponentRef Id="mod_shib_22.so_debug" />
<?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll_debug" />
- <?endif?>
+ <?endif ?>
<ComponentRef Id="mod_shib_24.so_debug" />
<ComponentRef Id="odbc_store.so_debug" />
<ComponentRef Id="plugins.so_debug" />
@@ -78,7 +78,7 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe_debug" />
<ComponentRef Id="shibresponder.exe_debug" />
- <?endif?>
+ <?endif ?>
<ComponentRef Id="shibd.exe_debug" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 274c667..aa2ffb8 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,109 +16,109 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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' />
+ <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" />
</Component>
- <Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />
+ <Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="mdquery64.exe" Name="mdquery.exe" />
</Component>
- <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.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' />
+ <Directory Id="bin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
+ <Component Id="resolvertest64.exe_debug" Guid="{58C98426-8C96-41EE-B956-A6BBAEAE5A10}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="resolvertest64.exe_debug" Name="resolvertest.exe" />
</Component>
- <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' />
+ <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" />
</Component>
</Directory><!-- bin_debug -->
</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' />
+ <Directory Id="lib64" Name="lib64">
+ <Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
+ <Component Id="adfs64.so" Guid="{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="adfs64.so" Name="adfs.so" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll' Name='isapi_shib.dll' />
+ <Component Id="isapi_shib64.dll" Guid="{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll" Name="isapi_shib.dll" />
</Component>
- <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' />
+ <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" />
</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' />
+ <Component Id="mod_shib_2264.so" Guid="{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so" Name="mod_shib_22.so" />
</Component>
- <Component Id='mod_shib_2464.so' Guid='{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so' Name='mod_shib_24.so' />
+ <Component Id="mod_shib_2464.so" Guid="{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so" Name="mod_shib_24.so" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='plugins64.so' Guid='{C78105F1-1258-41A4-8505-5437E90FB1B4}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='plugins64.so' Name='plugins.so' />
+ <Component Id="plugins64.so" Guid="{C78105F1-1258-41A4-8505-5437E90FB1B4}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="plugins64.so" Name="plugins.so" />
</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' />
+ <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" />
</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' />
+ <Component Id="shibauthorizer64.exe" Guid="{5A323F4F-AE87-451A-9253-1965E46C9C5F}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe" Name="shibauthorizer.exe" />
</Component>
- <Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />
+ <Component Id="shibresponder64.exe" Guid="{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe" Name="shibresponder.exe" />
</Component>
- <?endif?>
- <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' />
+ <?endif ?>
+ <Directory Id="lib64_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
+ <Component Id="adfs64.so_debug" Guid="{BFF58DDD-CF04-49B1-A172-C84087705D2A}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="adfs64.so_debug" Name="adfs.so" />
</Component>
- <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' />
+ <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" />
</Component>
- <Component Id='isapi_shib64.dll_debug' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll_debug' Name='isapi_shib.dll' />
+ <Component Id="isapi_shib64.dll_debug" Guid="{60BC5679-A40E-42E5-9FC0-CCE924E660ED}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll_debug" Name="isapi_shib.dll" />
</Component>
- <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' />
+ <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" />
</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' />
+ <Component Id="mod_shib_2264.so_debug" Guid="{59FE3C18-1920-48A0-80BC-7ECF8579E441}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so_debug" Name="mod_shib_22.so" />
</Component>
- <Component Id='mod_shib_2464.so_debug' Guid='{38EE87FE-EA2B-41B4-A457-38A8F84B9866}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so_debug' Name='mod_shib_24.so' />
+ <Component Id="mod_shib_2464.so_debug" Guid="{38EE87FE-EA2B-41B4-A457-38A8F84B9866}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so_debug" Name="mod_shib_24.so" />
</Component>
- <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' />
+ <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" />
</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' />
+ <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" />
</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' />
+ <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" />
</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' />
+ <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" />
</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' />
+ <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" />
</Component>
- <?endif?>
+ <?endif ?>
</Directory><!-- lib_shibboleth_debug -->
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
- <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release'>
+ <Directory Id="sbin64" Name="sbin64" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
<!-- Service bins are declared in main -->
- <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' />
+ <Directory Id="sbin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
+ <Component Id="shibd64.exe_debug" Guid="{657A1902-0104-47C7-84A7-AEB5F736B02F}" Win64="yes">
+ <File KeyPath="yes" Checksum="yes" Id="shibd64.exe_debug" Name="shibd.exe" />
</Component>
</Directory><!-- sbin_debug -->
</Directory><!-- sbin -->
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index ed22c34..46d3060 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,119 +16,119 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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' />
+ <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" />
</Component>
- <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>
- <File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />
+ <Component Id="mdquery.exe" Guid="{5F322597-3B26-48E5-95BA-CF991CF6D6DB}">
+ <File KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
</Component>
- <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.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' />
+ <Directory Id="bin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
+ <Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">
+ <File KeyPath="yes" Checksum="yes" Id="resolvertest.exe_debug" Name="resolvertest.exe" />
</Component>
- <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>
- <File KeyPath='yes' Checksum='yes' Id='mdquery.exe_debug' Name='mdquery.exe' />
+ <Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
+ <File KeyPath="yes" Checksum="yes" Id="mdquery.exe_debug" Name="mdquery.exe" />
</Component>
</Directory><!-- bin_debug -->
</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' />
+ <Directory Id="lib" Name="lib">
+ <Directory Id="lib_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
+ <Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">
+ <File KeyPath="yes" Checksum="yes" Name="adfs.so" />
</Component>
- <Component Id='adfs_lite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>
- <File KeyPath='yes' Checksum='yes' Name='adfs-lite.so' />
+ <Component Id="adfs_lite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
+ <File KeyPath="yes" Checksum="yes" Name="adfs-lite.so" />
</Component>
- <Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
- <File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />
+ <Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
+ <File KeyPath="yes" Checksum="yes" Name="isapi_shib.dll" />
</Component>
- <Component Id='iis7_shib.dll' Guid='{2DC61347-E3C9-467c-8530-6A369B53C729}'>
- <File KeyPath='yes' Checksum='yes' Name='iis7_shib.dll' />
+ <Component Id="iis7_shib.dll" Guid="{2DC61347-E3C9-467c-8530-6A369B53C729}">
+ <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" />
</Component>
- <Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
- <File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />
+ <Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
+ <File KeyPath="yes" Checksum="yes" Name="mod_shib_22.so" />
</Component>
- <Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>
- <File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />
+ <Component Id="mod_shib_24.so" Guid="{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}">
+ <File KeyPath="yes" Checksum="yes" Name="mod_shib_24.so" />
</Component>
<?if $(var.NSApi) != "" ?>
- <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
- <File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />
+ <Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
+ <File KeyPath="yes" Checksum="yes" Name="nsapi_shib.dll" />
</Component>
<?endif ?>
- <Component Id='odbc_store.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
- <File KeyPath='yes' Checksum='yes' Name='odbc-store.so' />
+ <Component Id="odbc_store.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
+ <File KeyPath="yes" Checksum="yes" Name="odbc-store.so" />
</Component>
- <Component Id='plugins.so' Guid='{F738E29B-903B-4C86-BE27-4C72EC69915E}'>
- <File KeyPath='yes' Checksum='yes' Name='plugins.so' />
+ <Component Id="plugins.so" Guid="{F738E29B-903B-4C86-BE27-4C72EC69915E}">
+ <File KeyPath="yes" Checksum="yes" Name="plugins.so" />
</Component>
- <Component Id='plugins_lite.so' Guid='{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}'>
- <File KeyPath='yes' Checksum='yes' Name='plugins-lite.so' />
+ <Component Id="plugins_lite.so" Guid="{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}">
+ <File KeyPath="yes" Checksum="yes" Name="plugins-lite.so" />
</Component>
<?if $(var.FCGI) != "" ?>
- <Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>
- <File KeyPath='yes' Checksum='yes' Name='shibauthorizer.exe' />
+ <Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
+ <File KeyPath="yes" Checksum="yes" Name="shibauthorizer.exe" />
</Component>
- <Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>
- <File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />
+ <Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
+ <File KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
</Component>
- <?endif?>
- <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' />
+ <?endif ?>
+ <Directory Id="lib_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
+ <Component Id="adfs.so_debug" Guid="{9B8E071F-B251-4373-A786-8966FD0D22EF}">
+ <File KeyPath="yes" Checksum="yes" Id="adfs.so_debug" Name="adfs.so" />
</Component>
- <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' />
+ <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" />
</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' />
+ <Component Id="isapi_shib.dll_debug" Guid="{F8212D30-0BA8-4F02-B595-E8E5D312342B}">
+ <File KeyPath="yes" Checksum="yes" Id="isapi_shib.dll_debug" Name="isapi_shib.dll" />
</Component>
- <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' />
+ <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" />
</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' />
+ <Component Id="mod_shib_22.so_debug" Guid="{3DA4492F-C0EA-4286-9C37-13F82342FA67}">
+ <File KeyPath="yes" Checksum="yes" Id="mod_shib_22.so_debug" Name="mod_shib_22.so" />
</Component>
- <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' />
+ <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" />
</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' />
+ <Component Id="nsapi_shib.dll_debug" Guid="{492A5D72-4FE0-417E-9023-311E1BF34816}">
+ <File KeyPath="yes" Checksum="yes" Id="nsapi_shib.dll_debug" Name="nsapi_shib.dll" />
</Component>
- <?endif?>
- <Component Id='odbc_store.so_debug' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
- <File KeyPath='yes' Checksum='yes' Id='odbc_store.so_debug' Name='odbc-store.so' />
+ <?endif ?>
+ <Component Id="odbc_store.so_debug" Guid="{F217D7CF-91C1-4318-901D-709C710803C6}">
+ <File KeyPath="yes" Checksum="yes" Id="odbc_store.so_debug" Name="odbc-store.so" />
</Component>
- <Component Id='plugins.so_debug' Guid='{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}'>
- <File KeyPath='yes' Checksum='yes' Id='plugins.so_debug' Name='plugins.so' />
+ <Component Id="plugins.so_debug" Guid="{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}">
+ <File KeyPath="yes" Checksum="yes" Id="plugins.so_debug" Name="plugins.so" />
</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' />
+ <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" />
</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' />
+ <Component Id="shibauthorizer.exe_debug" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
+ <File KeyPath="yes" Checksum="yes" Id="shibauthorizer.exe_debug" Name="shibauthorizer.exe" />
</Component>
- <Component Id='shibresponder.exe_debug' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>
- <File KeyPath='yes' Checksum='yes' Id='shibresponder.exe_debug' Name='shibresponder.exe' />
+ <Component Id="shibresponder.exe_debug" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
+ <File KeyPath="yes" Checksum="yes" Id="shibresponder.exe_debug" Name="shibresponder.exe" />
</Component>
- <?endif?>
+ <?endif ?>
</Directory><!-- lib_shibboleth_debug -->
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
- <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release'>
+ <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) -->
- <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' />
+ <Directory Id="sbin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
+ <Component Id="shibd.exe_debug" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
+ <File KeyPath="yes" Checksum="yes" Id="shibd.exe_debug" Name="shibd.exe" />
</Component>
</Directory><!-- sbin_debug -->
</Directory><!-- sbin -->
diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index 1ed20d1..042e54e 100644
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,7 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
<Fragment>
@@ -30,90 +30,90 @@
and the generated.msi -->
<!-- Property that Light complained for -->
- <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />
+ <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' />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
- <UI Id='ShibbolethInstallDir' >
+ <UI Id="ShibbolethInstallDir">
<!-- "WixUI_InstallDir includes the following dialogs:" -->
- <DialogRef Id='BrowseDlg' />
- <DialogRef Id='DiskCostDlg' />
- <DialogRef Id='InvalidDirDlg' />
- <DialogRef Id='LicenseAgreementDlg' />
- <DialogRef Id='WelcomeDlg' />
+ <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' />
+ <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' />
+ <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'/>
+ <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'>
+ <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'>
+ <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="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="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
- <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='LicenseAgreementDlg'>
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">
(NOT Installed) AND (NOT ALREADYINSTALLED)
</Publish>
- <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='UpdateDlgShib'>
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib">
(NOT Installed) AND ALREADYINSTALLED
</Publish>
- <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg'>
+ <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'>
+ <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'>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib">
(NOT Installed) AND (NOT ALREADYINSTALLED)
</Publish>
- <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='UpdateDlgShib'>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib">
(NOT Installed) AND ALREADYINSTALLED
</Publish>
- <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
Installed AND NOT PATCH
</Publish>
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
index 1150113..aec01fb 100644
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,7 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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>
@@ -28,65 +28,57 @@
- INSTALL_IIS7_PLUGIN (if IIS about)
-->
- <Dialog Id='InstallDirDlgShib' Width='370' Height='270' Title='[ProductName] Setup'>
+ <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' />
+ <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="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="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.' />
+ <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 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.' />
+ <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 IIS7 modules'>
- <Condition Action='show'>IISMAJORVERSION AND (IISMAJORVERSION <> "#6")</Condition>
- <Condition Action='hide'>NOT IISMAJORVERSION OR (IISMAJORVERSION = "#6")</Condition>
+ <Control Id="InstallIIS7" Type="CheckBox" X="225" Y="140" Height="17" Width="120" Property="INSTALL_IIS7_PLUGIN" CheckBoxValue="TRUE" Text="Configure IIS7 modules">
+ <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 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' >
+ <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' >
+ <Publish Event="SpawnDialog" Value="InvalidDirDlg">
NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"
</Publish>
- <Publish Event='NewDialog' Value='VerifyReadyDlg'>
+ <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 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>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 32ac718..16958c7 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,209 +16,200 @@
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='301' Platform='x64'/>
+<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="301" Platform="x64" />
- <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
- MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes' />
+ <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'/>
+ <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>
+ <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' />
+ <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'/>
+ <Property Id="IS64BITINSTALL" Value="TRUE" />
- <UIRef Id='ShibbolethInstallDir'/>
+ <UIRef Id="ShibbolethInstallDir" />
<!-- Files -->
- <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id="TARGETDIR" Name="SourceDir">
<!-- The test bit -->
- <Directory Id='opt' Name='opt'>
- <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+ <Directory Id="opt" Name="opt">
+ <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
</Directory>
- <Directory Id='ProgramFilesFolder' Name='PFiles'>
+ <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' />
+ <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' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm' DiskId='1' />
+ <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" />
+ <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <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'>
+ <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' />
+ <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' />
- <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x64.msm' DiskId='1' />
+ <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" />
+ <Merge Id="Microsoft_DebugCRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm" DiskId="1" />
+ <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 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 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'/>
+ <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'/>
-
- <MergeRef Id='Microsoft_DebugCRT_x86'/>
- <MergeRef Id='Microsoft_CRT_x86'/>
-
- <MergeRef Id='CurlMergeModule_x64'/>
+ <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" />
+
+ <MergeRef Id="Microsoft_DebugCRT_x86" />
+ <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'/>
-
- <MergeRef Id='Microsoft_DebugCRT_x64'/>
- <MergeRef Id='Microsoft_CRT_x64'/>
+ <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" />
+
+ <MergeRef Id="Microsoft_DebugCRT_x64" />
+ <MergeRef Id="Microsoft_CRT_x64" />
<!-- ShibbolethSP-exe-x64-->
- <ComponentRef Id='resolvertest64.exe'/>
- <ComponentRef Id='mdquery64.exe'/>
- <ComponentRef Id='resolvertest64.exe_debug'/>
- <ComponentRef Id='mdquery64.exe_debug'/>
-
- <ComponentRef Id='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'/>
+ <ComponentRef Id="resolvertest64.exe" />
+ <ComponentRef Id="mdquery64.exe" />
+ <ComponentRef Id="resolvertest64.exe_debug" />
+ <ComponentRef Id="mdquery64.exe_debug" />
+
+ <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?>
-
- <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'/>
+ <ComponentRef Id="shibauthorizer64.exe" />
+ <ComponentRef Id="shibresponder64.exe" />
+ <?endif ?>
+
+ <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="shibauthorizer64.exe_debug" />
+ <ComponentRef Id="shibresponder64.exe_debug" />
+ <?endif ?>
- <ComponentRef Id='shibd64.exe_debug'/>
+ <ComponentRef Id="shibd64.exe_debug" />
<!-- ShibbolethSP-registry-x64 -->
- <ComponentRef Id='TargetDir64'/>
- <ComponentRef Id='Install32Bit64'/>
- <ComponentRef Id='shib64.ico'/>
+ <ComponentRef Id="TargetDir64" />
+ <ComponentRef Id="Install32Bit64" />
+ <ComponentRef Id="shib64.ico" />
<!-- ShibbolethSP-main-x64 -->
- <ComponentRef Id='SetPath'/>
- <ComponentRef Id='SetPath64'/>
+ <ComponentRef Id="SetPath" />
+ <ComponentRef Id="SetPath64" />
<?include ShibbolethSP-defs-x86.wxi ?>
<!--
We put the messages for IIS7 and Shibd in this module since all others are shared with x86
-->
- <Component Id='messageFile' Guid='{3FF89632-9F39-4B1B-AA3E-3AF6C8155B92}' Win64='yes' Directory='bin64'>
- <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\Messages.dll'/>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <Component Id="messageFile" Guid="{3FF89632-9F39-4B1B-AA3E-3AF6C8155B92}" Win64="yes" Directory="bin64">
+ <File Id="Messages" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\Messages.dll" />
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
</Component>
- <Component Id='messageIIS7' Guid='{1CC5CF4A-6203-4ab8-9743-4A79C95D30CE}' Win64='yes' Directory='bin64'>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <Component Id="messageIIS7" Guid="{1CC5CF4A-6203-4ab8-9743-4A79C95D30CE}" Win64="yes" Directory="bin64">
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
</Component>
- <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' />
+ <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" />
</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' />
+ <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" />
<!-- 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 2 Daemon (Default)'
- Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
- Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
- Type='ownProcess' Start='auto' ErrorControl='ignore' />
- <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
- Remove='uninstall' Start='install' Wait='no' />
+ <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth 2 Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
+ <ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
</Component>
</Feature>
@@ -226,12 +217,10 @@
<!-- 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'/>
+ <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" />
<InstallExecuteSequence>
<!-- Install IIS if
@@ -239,19 +228,19 @@
- AND we were told to
- AND this is NOT an upgrade
-->
- <Custom Action='SetQtInstallIIS32' Before='InstallFiles'>
+ <Custom Action="SetQtInstallIIS32" Before="InstallFiles">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <Custom Action='SetQtInstallIIS64' After='InstallFiles'>
+ <Custom Action="SetQtInstallIIS64" After="InstallFiles">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <Custom Action='QtInstallIIS32' After='SetQtInstallIIS32'>
+ <Custom Action="QtInstallIIS32" After="SetQtInstallIIS32">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <Custom Action='QtInstallIIS64' After='SetQtInstallIIS64'>
+ <Custom Action="QtInstallIIS64" After="SetQtInstallIIS64">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <ScheduleReboot Before='InstallFinalize'>
+ <ScheduleReboot Before="InstallFinalize">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</ScheduleReboot>
</InstallExecuteSequence>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index afbde6b..8274cdb 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,139 +16,127 @@
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='301'/>
+<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="301" />
- <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
- MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes'/>
+ <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
- <PropertyRef Id='SHIB_OLDVERSION'/>
+ <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="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>
+ <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' />
+ <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'/>
+ <Property Id="IS64BITINSTALL" Value="FALSE" />
- <UIRef Id='ShibbolethInstallDir'/>
+ <UIRef Id="ShibbolethInstallDir" />
<!-- Files -->
- <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id="TARGETDIR" Name="SourceDir">
<!-- The test bit -->
- <Directory Id='opt' Name='opt'>
- <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+ <Directory Id="opt" Name="opt">
+ <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
</Directory>
- <Directory Id='ProgramFilesFolder' Name='PFiles'>
+ <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' />
+ <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' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm' DiskId='1' />
+ <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" />
+ <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <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 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'/>
+ <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'/>
-
- <MergeRef Id='Microsoft_DebugCRT_x86'/>
- <MergeRef Id='Microsoft_CRT_x86' />
+ <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" />
+
+ <MergeRef Id="Microsoft_DebugCRT_x86" />
+ <MergeRef Id="Microsoft_CRT_x86" />
<!-- ShibbolethSP-main-x86 -->
- <ComponentRef Id='SetPath'/>
+ <ComponentRef Id="SetPath" />
<?include ShibbolethSP-defs-x86.wxi ?>
<!--
We put in the messages for Isapi and Shibd in this module since all others are shared with x64
-->
- <Component Id='messageFile' Guid='{7B81ACC5-B79C-426B-ACB8-346A52E5FF60}' Win64='no' Directory='bin'>
- <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\Messages.dll'/>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <Component Id="messageFile" Guid="{7B81ACC5-B79C-426B-ACB8-346A52E5FF60}" Win64="no" Directory="bin">
+ <File Id="Messages" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\Messages.dll" />
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
</Component>
- <Component Id='messageIIS7' Guid='{FDEB81BA-4935-49c2-84FE-E58F674F5FF3}' Win64='no' Directory='bin'>
- <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter'>
- <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
- <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
- <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
- <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+ <Component Id="messageIIS7" Guid="{FDEB81BA-4935-49c2-84FE-E58F674F5FF3}" Win64="no" Directory="bin">
+ <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter">
+ <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
+ <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+ <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
+ <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
</RegistryKey>
</Component>
- <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' />
+ <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" />
<!-- 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 2 Daemon (Default)'
- Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
- Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
- Type='ownProcess' Start='auto' ErrorControl='ignore' />
- <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
- Remove='uninstall' Start='install' Wait='no' />
+ <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth 2 Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
+ <ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
</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="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="QtInstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
<InstallExecuteSequence>
<!-- Install IIS if
@@ -156,13 +144,13 @@
- AND we were told to
- AND this is NOT an upgrade
-->
- <Custom Action='SetQtInstallIIS' Before='InstallFiles'>
+ <Custom Action="SetQtInstallIIS" Before="InstallFiles">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <Custom Action='QtInstallIIS' After='SetQtInstallIIS'>
+ <Custom Action="QtInstallIIS" After="SetQtInstallIIS">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</Custom>
- <ScheduleReboot Before='InstallFinalize'>
+ <ScheduleReboot Before="InstallFinalize">
(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
</ScheduleReboot>
</InstallExecuteSequence>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index c70fc5a..244f3a0 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -15,7 +15,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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
@@ -25,134 +25,134 @@
<!-- Files First -->
<!-- Configuration, licenses and documentation -->
- <DirectoryRef Id='INSTALLDIR'>
- <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' />
+ <DirectoryRef Id="INSTALLDIR">
+ <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 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 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 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 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 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' />
+ <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_shibboleth3.xml' Guid='{BD582026-0DB4-4664-A36F-0AC646596641}' Permanent='yes'>
- <File KeyPath='yes' Name='example-shibboleth3.xml' />
+ <Component Id="example_shibboleth3.xml" Guid="{BD582026-0DB4-4664-A36F-0AC646596641}" Permanent="yes">
+ <File KeyPath="yes" Name="example-shibboleth3.xml" />
</Component>
- <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
- <File KeyPath='yes' Name='keygen.bat'/>
+ <Component Id="keygen.bat" Guid="{A5BBCB8B-42B3-4402-B66D-66D2971F509F}">
+ <File KeyPath="yes" Name="keygen.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' />
+ <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 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 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 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 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 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 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 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 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 Id="attribute_policy.xml" Guid="{55B88F7B-E2EA-4B70-87B7-33C566B9F992}">
+ <File KeyPath="yes" Name="attribute-policy.xml" />
</Component>
- <Component Id='shibboleth3.xml' Guid='{E7AA9D74-4A67-4FED-BEAB-6DCD2B2EB9FA}'>
- <File KeyPath='yes' Name='shibboleth3.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth3.xml' />
+ <Component Id="shibboleth3.xml" Guid="{E7AA9D74-4A67-4FED-BEAB-6DCD2B2EB9FA}">
+ <File KeyPath="yes" Name="shibboleth3.xml" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth3.xml" />
</Component>
- <Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>
- <File KeyPath='yes' Name='console.logger' />
+ <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 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 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 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 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 Id="security_policy.xml" Guid="{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}">
+ <File KeyPath="yes" Name="security-policy.xml" />
</Component>
- <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}'>
- <File KeyPath='yes' Name='accessError.html' />
+ <Component Id="accessError.html" Guid="{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}">
+ <File KeyPath="yes" Name="accessError.html" />
</Component>
- <Component Id='attrChecker.html' Guid='{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}'>
- <File KeyPath='yes' Name='attrChecker.html' />
+ <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 Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
+ <File KeyPath="yes" Name="metadataError.html" />
</Component>
- <Component Id='native.logger.in' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>
- <File KeyPath='yes' Name='native.logger.in' />
+ <Component Id="native.logger.in" Guid="{8586D4C7-E237-4C7F-BC79-DE0B06473395}">
+ <File KeyPath="yes" Name="native.logger.in" />
</Component>
- <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}'>
- <File KeyPath='yes' Name='sessionError.html' />
+ <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 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}'>
+ <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'/>
+ <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}'>
+ <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}'>
+ <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 -->
@@ -162,46 +162,45 @@
<!-- 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' />
+ <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="EditConfigFiles" BinaryKey="EditConfigFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetEditConfigFiles" Property="EditConfigFiles" Value="[INSTALLDIR];@;[IS64BITINSTALL]" />
- <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
- <CustomAction Id='SetKeyGen' Property='KeyGen' Value='"[INSTALLDIR]etc\shibboleth\keygen.bat"' />
+ <CustomAction Id="KeyGen" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetKeyGen" Property="KeyGen" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat"" />
<!-- Inherit the installation dir if one was set -->
- <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
- <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
+ <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
+ <CustomAction Id="InheritInstallDir64" Property="INSTALLDIR" Value="[OLD_INSTALLDIR64]" />
<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'>
+ <Custom Action="InheritInstallDir" After="AppSearch">
OLD_INSTALLDIR
</Custom>
- <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+ <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="SetEditConfigFiles" Before="CostInitialize">NOT Installed</Custom>
+ <Custom Action="EditConfigFiles" After="InstallFiles">NOT Installed</Custom>
- <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>
+ <Custom Action="SetKeyGen" Before="CostInitialize">NOT Installed</Custom>
<!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
- <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom>
+ <Custom Action="KeyGen" After="WriteEnvironmentStrings">NOT Installed</Custom>
<!-- IIS handling is no longer architecture independant and happens in ShibbolethSP-main-x?? -->
<!-- Duplicate actions from the UI case -->
- <Custom Action='InheritInstallDir' After='AppSearch'>
+ <Custom Action="InheritInstallDir" After="AppSearch">
OLD_INSTALLDIR
</Custom>
- <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+ <Custom Action="InheritInstallDir64" After="InheritInstallDir">
(NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
</Custom>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 99e4820..4b1f9bf 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -20,29 +20,29 @@
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'>
+<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' />
+ <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/' />
+ <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' />
+ <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\'/>
+ <Property Id="INSTALLDIR" Value="C:\opt\shibboleth-sp\" />
<!-- IISMAJORVERSION if IIS installed -->
- <PropertyRef Id='IISMAJORVERSION' />
+ <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 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
index 60d5561..634b612 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,7 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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
@@ -25,63 +25,40 @@
<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 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 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 Id="OLD_INSTALL_32BIT" Secure="yes">
+ <RegistrySearch Id="OldInstall32Bit" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Type="raw" Win64="yes" />
</Property>
- <DirectoryRef Id='bin64'>
+ <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 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 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 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>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index 6d24435..617e03a 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,7 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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
@@ -24,68 +24,40 @@
-->
<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 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 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 Id="OLD_SERVICEINSTALLED" Secure="yes">
+ <RegistrySearch Id="OldServiceInstalled" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\shibd_Default" Name="ImagePath" Type="raw" />
</Property>
- <DirectoryRef Id='bin'>
+ <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 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 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>
diff --git a/msi/WiX/ShibbolethSP-update-dlg.wxs b/msi/WiX/ShibbolethSP-update-dlg.wxs
index 5ab77a1..2b023e5 100644
--- a/msi/WiX/ShibbolethSP-update-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-update-dlg.wxs
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -16,36 +16,33 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<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'>
+ <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' />
+ <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]'/>
+ <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 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 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 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>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list