[cpp-sp] 02/02: SSPCPP-870 Install PDB files
Rod Widdowson
rdw at steadingsoftware.com
Sat Feb 15 12:00:08 EST 2020
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=8a6a573adf7d07a5036c1d14c310cced0f2e1d72
commit 8a6a573adf7d07a5036c1d14c310cced0f2e1d72
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Feb 15 16:56:57 2020 +0000
SSPCPP-870 Install PDB files
https://issues.shibboleth.net/jira/browse/SSPCPP-870
---
msi/WiX/MergeModules/Curl-x64.wxs | 4 ++++
msi/WiX/MergeModules/Curl-x86.wxs | 4 ++++
msi/WiX/MergeModules/Log4Shib-x64.wxs | 2 ++
msi/WiX/MergeModules/Log4Shib-x86.wxs | 2 ++
msi/WiX/MergeModules/MergeModules.make | 12 ++++++++++--
msi/WiX/MergeModules/OpenSAML-x64.wxs | 8 ++++++++
msi/WiX/MergeModules/OpenSAML-x86.wxs | 8 ++++++++
msi/WiX/MergeModules/OpenSSL-x64.wxs | 13 ++++++++++++-
msi/WiX/MergeModules/Shibboleth-x64.wxs | 4 ++++
msi/WiX/MergeModules/Shibboleth-x86.wxs | 4 ++++
msi/WiX/MergeModules/Xerces-x64.wxs | 2 ++
msi/WiX/MergeModules/Xerces-x86.wxs | 2 ++
msi/WiX/MergeModules/XmlSec-x64.wxs | 14 ++++++++++++++
msi/WiX/MergeModules/XmlSec-x86.wxs | 14 ++++++++++++++
msi/WiX/MergeModules/Zlib-x64.wxs | 2 ++
msi/WiX/MergeModules/Zlib-x86.wxs | 2 ++
msi/WiX/ShibbolethSP-exe-x64.wxs | 27 +++++++++++++++++++++++++++
msi/WiX/ShibbolethSP-exe-x86.wxs | 29 +++++++++++++++++++++++++++++
msi/WiX/ShibbolethSP-main-x64.wxs | 1 +
msi/WiX/ShibbolethSP-main-x86.wxs | 1 +
20 files changed, 152 insertions(+), 3 deletions(-)
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 06b780f..679942f 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -18,8 +18,10 @@
<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
@@ -33,6 +35,7 @@
<Directory Id="lib" Name="lib">
<Component Id="libcurl5.dll" Guid="$(var.LibCurlGuid64)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseLibDir)\libcurl$(var.CurlFileVersion).pdb" />
</Component>
<Component Id="curl.exe" Guid="{52103377-AEF6-4533-B0CE-D3A786D2D17E}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
@@ -41,6 +44,7 @@
<Directory Id="lib_debug" Name="debug">
<Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugLibDir)\libcurl$(var.CurlFileVersion)d.pdb" />
</Component>
<Component Id="curl.exe_debug" Guid="{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}" Win64="yes">
<File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 5adafbd..ec4de57 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -18,8 +18,10 @@
<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugLibDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="CurlMergeModule_x86" Language="1033" Version="$(var.CurlVersion)">
@@ -32,6 +34,7 @@
<Directory Id="lib" Name="lib">
<Component Id="libcurl5.dll" Guid="$(var.LibCurlGuid32)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseLibDir)\libcurl$(var.CurlFileVersion).pdb" />
</Component>
<Component Id="curl.exe" Guid="{67A6F011-9715-43C2-92F1-70FE53E935AD}">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
@@ -40,6 +43,7 @@
<Directory Id="lib_debug" Name="debug">
<Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid32d)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugLibDir)\libcurl$(var.CurlFileVersion)d.pdb" />
</Component>
<Component Id="curl.exe_debug" Guid="{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}">
<File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index befb4e0..6787369 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -27,6 +27,7 @@
<Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\x64\Release\">
<Component Id="log4shib.dll" Guid="$(var.Log4ShibComponent64)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion).pdb" />
</Component>
<Component Id="NTEventLogAppender.dll" Guid="{1A559035-DCA4-4297-AE94-C3E6ABB37662}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
@@ -35,6 +36,7 @@
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\x64\Debug\">
<Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion)D.pdb" />
</Component>
<Component Id="NTEventLogAppender.dll_debug" Guid="{6C23C432-EA11-4313-9F5F-DBB09A8752E8}" Win64="yes">
<File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 81ea691..ac2a5a3 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -27,6 +27,7 @@
<Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\Release\">
<Component Id="log4shib.dll" Guid="$(var.Log4ShibComponent32)">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion).pdb" />
</Component>
<Component Id="NTEventLogAppender.dll" Guid="{43B944CB-E42A-4D17-A601-AC4E14DA2217}">
<File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
@@ -35,6 +36,7 @@
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\Debug\">
<Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent32d)">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="log4shib$(var.Log4ShibFileVersion)D.pdb" />
</Component>
<Component Id="NTEventLogAppender.dll_debug" Guid="{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}">
<File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index ba6c392..eb3bf07 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -210,22 +210,30 @@ Xerces-x64.msm: Xerces-x64.wixobj
XercesDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
XercesDebugDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
+XercesPdb32=$(BuildSP)\$(Xerces)\Buildx86\src\Release\xerces-c_$(XercesFileVersion).pdb
+XercesDebugPdb32=$(BuildSP)\$(Xerces)\Buildx86\src\Debug\xerces-c_$(XercesFileVersion)D.pdb
+
Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs
wixcop -indent:2 Xerces-x86.wxs
candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll32) -dXercesDebugDll=$(XercesDebugDll32) \
-dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) \
-dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\
- -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)
+ -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)\
+ -dXercesDebugPdb=$(XercesDebugPdb32) -dXercesPdb=$(XercesPdb32)
XercesDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
XercesDebugDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
+XercesPdb64=$(BuildSP)\$(Xerces)\Buildx64\src\Release\xerces-c_$(XercesFileVersion).pdb
+XercesDebugPdb64=$(BuildSP)\$(Xerces)\Buildx64\src\Debug\xerces-c_$(XercesFileVersion)D.pdb
+
Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs
wixcop -indent:2 Xerces-x64.wxs
candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll64) -dXercesDebugDll=$(XercesDebugDll64) \
-dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) \
-dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\
- -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)
+ -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)\
+ -dXercesDebugPdb=$(XercesDebugPdb64) -dXercesPdb=$(XercesPdb64)
#
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 7aa0902..dadf284 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -27,29 +27,37 @@
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\x64\Release\">
<Component Id="saml.dll" Guid="$(var.SamlComponent64)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion).pdb" />
</Component>
<Component Id="samlsign.exe" Guid="{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
+ <File KeyPath="no" Checksum="no" Name="samlsign.pdb" />
</Component>
<Component Id="xmltooling.dll" Guid="$(var.XMLToolingComponent64)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).pdb" />
</Component>
<Component Id="xmltooling_lite.dll" Guid="$(var.XMLToolingLiteComponent64)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\x64\Debug\">
<Component Id="samlD.dll" Guid="$(var.SamlComponent64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion)D.pdb" />
</Component>
<Component Id="samlsign.exe_debug" Guid="{A6588914-93E1-4FAF-B237-39C0240EECB1}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
+ <File KeyPath="no" Checksum="no" Id="samlsign.pdb_debug" Name="samlsign.pdb" />
</Component>
<Component Id="xmltoolingD.dll" Guid="$(var.XMLToolingComponent64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.pdb" />
</Component>
<Component Id="xmltooling_liteD.dll" Guid="$(var.XMLToolingLiteComponent64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.pdb" />
</Component>
</Directory><!-- lib_debug -->
<?endif ?>
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index c8ca63b..d14699d 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -27,29 +27,37 @@
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Release\">
<Component Id="saml.dll" Guid="$(var.SamlComponent32)">
<File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion).pdb" />
</Component>
<Component Id="samlsign.exe" Guid="{3DC7A431-9623-4283-BA07-444DB1C1F864}">
<File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
+ <File KeyPath="no" Checksum="no" Name="samlsign.pdb" />
</Component>
<Component Id="xmltooling.dll" Guid="$(var.XMLToolingComponent32)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).pdb" />
</Component>
<Component Id="xmltooling_lite.dll" Guid="$(var.XMLToolingLiteComponent32)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Debug\">
<Component Id="samlD.dll" Guid="$(var.SamlComponent32d)">
<File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion)D.pdb" />
</Component>
<Component Id="samlsign.exe_debug" Guid="{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}">
<File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
+ <File KeyPath="no" Checksum="no" Id="samlsign.pdb_debug" Name="samlsign.pdb" />
</Component>
<Component Id="xmltoolingD.dll" Guid="$(var.XMLToolingComponent32d)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.pdb" />
</Component>
<Component Id="xmltooling_liteD.dll" Guid="$(var.XMLToolingLiteComponent32d)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.pdb" />
</Component>
</Directory><!-- lib_debug -->
<?endif ?>
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index e84fd74..c60a5c1 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -18,11 +18,16 @@
<?define ReleaseDir="x64\bin"?>
<?define DebugDir="x64Debug\bin"?>
-<?define LibEay="libcrypto-$(var.OpenSSLFileVersion)-x64.dll"?>
+<?define LibEay="libcrypto-$(var.OpenSSLFileVersion)-x64.dll"?>
<?define LibEayD="libcrypto-$(var.OpenSSLFileVersion)D-x64.dll"?>
<?define SslEay="libssl-$(var.OpenSSLFileVersion)-x64.dll"?>
<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D-x64.dll"?>
+<?define LibEayPdb="libcrypto-$(var.OpenSSLFileVersion)-x64.pdb"?>
+<?define LibEayDPdb="libcrypto-$(var.OpenSSLFileVersion)D-x64.pdb"?>
+<?define SslEayPdb="libssl-$(var.OpenSSLFileVersion)-x64.pdb"?>
+<?define SslEayDPdb="libssl-$(var.OpenSSLFileVersion)D-x64.pdb"?>
+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSSLMergeModule_x64" Language="1033" Version="$(var.OpenSSLVersion)">
<Package Id="{EEB21422-347C-4AFA-A347-DCA0E5D61572}" Description="Merge Module for OpenSSL (x64)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
@@ -33,23 +38,29 @@
<Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\">
<Component Id="libeay32.dll" Guid="$(var.LibEay64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEay)" />
+ <!--<File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" /> -->
</Component>
<Component Id="ssleay32.dll" Guid="$(var.SSlEay64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
+ <!--<File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" /> -->
</Component>
<Component Id="openssl.exe" Guid="{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
+ <!-- <File KeyPath="no" Checksum="no" Name="openssl.pdb" /> -->
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
<Component Id="libeay32D.dll" Guid="$(var.LibEay64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
+ <!-- <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" /> -->
</Component>
<Component Id="ssleay32D.dll" Guid="$(var.SSlEay64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
+ <!-- <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" /> -->
</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" />
+ <!-- <File Id="openssl.pdb_debug" KeyPath="no" Checksum="no" Name="openssl.pdb" /> -->
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index c215df2..308adeb 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -26,17 +26,21 @@
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\x64\Release">
<Component Id="shibsp.dll" Guid="$(var.ShibDll64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion).pdb" />
</Component>
<Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\x64\Debug">
<Component Id="shibspD.dll" Guid="$(var.ShibDll64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion)D.pdb" />
</Component>
<Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.pdb" />
</Component>
</Directory><!-- lib_debug -->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index c9da61a..ba7289f 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -26,17 +26,21 @@
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Release">
<Component Id="shibsp.dll" Guid="$(var.ShibDll32Component)">
<File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion).pdb" />
</Component>
<Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite32Component)">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Debug">
<Component Id="shibspD.dll" Guid="$(var.ShibDll32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion)D.pdb" />
</Component>
<Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.pdb" />
</Component>
</Directory><!-- lib_debug -->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 1fb509f..6d2c1d3 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -26,11 +26,13 @@
<Directory Id="lib" Name="lib">
<Component Id="xercesc.dll" Guid="$(var.Xerces64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
+ <!-- <File KeyPath="no" Checksum="no" Source="$(var.XercesPdb)" /> -->
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="xercescD.dll" Guid="$(var.Xerces64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
+ <File KeyPath="no" Checksum="no" Source="$(var.XercesDebugPdb)" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 3fe9ac6..3228853 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -26,11 +26,13 @@
<Directory Id="lib" Name="lib">
<Component Id="xercesc.dll" Guid="$(var.Xerces32Component)">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
+ <!-- <File KeyPath="no" Checksum="no" Source="$(var.XercesPdb)" /> -->
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="xercescD.dll" Guid="$(var.Xerces32Componentd)">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDebugDll)" />
+ <File KeyPath="no" Checksum="no" Source="$(var.XercesDebugPdb)" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index cfa0ee6..5046199 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -26,47 +26,61 @@
<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" />
+ <File KeyPath="no" Checksum="no" Name="xsec_lib.pdb" />
</Component>
<Component Id="c14n.exe" Guid="{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
+ <File KeyPath="no" Checksum="no" Name="c14n.pdb" />
</Component>
<Component Id="checksig.exe" Guid="{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
+ <File KeyPath="no" Checksum="no" Name="checksig.pdb" />
</Component>
<Component Id="cipher.exe" Guid="{192AEEF7-3AE2-4570-AA30-1A2046646A84}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
+ <File KeyPath="no" Checksum="no" Name="cipher.pdb" />
</Component>
<Component Id="siginf.exe" Guid="{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
+ <File KeyPath="no" Checksum="no" Name="siginf.pdb" />
</Component>
<Component Id="templatesign.exe" Guid="{71B603E6-A54B-4843-A4F8-826AD4CA6A04}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
+ <File KeyPath="no" Checksum="no" Name="templatesign.pdb" />
</Component>
<Component Id="txfmout.exe" Guid="{2D9025EE-D95F-4D3C-B0E7-86D742749D39}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
+ <File KeyPath="no" Checksum="no" Name="txfmout.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal">
<Component Id="xsecD.dll" Guid="$(var.XmlSec64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />
</Component>
<Component Id="c14n.exe_debug" Guid="{ED9BB341-C5D2-4234-B720-483D86D340F9}" Win64="yes">
<File Id="c14n.exe_debug" KeyPath="yes" Checksum="yes" Name="c14n.exe" />
+ <File Id="c14n.pdb_debug" KeyPath="no" Checksum="no" Name="c14n.pdb" />
</Component>
<Component Id="checksig.exe_debug" Guid="{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}" Win64="yes">
<File Id="checksig.exe_debug" KeyPath="yes" Checksum="yes" Name="checksig.exe" />
+ <File Id="checksig.pdb_debug" KeyPath="no" Checksum="no" Name="checksig.pdb" />
</Component>
<Component Id="cipher.exe_debug" Guid="{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}" Win64="yes">
<File Id="cipher.exe_debug" KeyPath="yes" Checksum="yes" Name="cipher.exe" />
+ <File Id="cipher.pdb_debug" KeyPath="no" Checksum="no" Name="cipher.pdb" />
</Component>
<Component Id="siginf.exe_debug" Guid="{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}" Win64="yes">
<File Id="siginf.exe_debug" KeyPath="yes" Checksum="yes" Name="siginf.exe" />
+ <File Id="siginf.pdb_debug" KeyPath="no" Checksum="no" Name="siginf.pdb" />
</Component>
<Component Id="templatesign.exe_debug" Guid="{5AE22CDB-625E-4DC7-9586-77C3DD835100}" Win64="yes">
<File Id="templatesign.exe_debug" KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
+ <File Id="templatesign.pdb_debug" KeyPath="no" Checksum="no" Name="templatesign.pdb" />
</Component>
<Component Id="txfmout.exe_debug" Guid="{373B4E3D-6643-4884-8D0C-324DEF910230}" Win64="yes">
<File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
+ <File Id="txfmout.pdb_debug" KeyPath="no" Checksum="no" Name="txfmout.pdb" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 4bffd76..c6008fe 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -26,47 +26,61 @@
<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" />
+ <File KeyPath="no" Checksum="no" Name="xsec_lib.pdb" />
</Component>
<Component Id="c14n.exe" Guid="{576EB311-AADA-49D3-B444-7EDC37C715F3}">
<File KeyPath="yes" Checksum="yes" Name="c14n.exe" />
+ <File KeyPath="no" Checksum="no" Name="c14n.pdb" />
</Component>
<Component Id="checksig.exe" Guid="{F0C2B97A-7B93-4CD3-9432-E5904D337815}">
<File KeyPath="yes" Checksum="yes" Name="checksig.exe" />
+ <File KeyPath="no" Checksum="no" Name="checksig.pdb" />
</Component>
<Component Id="cipher.exe" Guid="{654BB761-7B9D-4766-AC5F-DC174E7B94AE}">
<File KeyPath="yes" Checksum="yes" Name="cipher.exe" />
+ <File KeyPath="no" Checksum="no" Name="cipher.pdb" />
</Component>
<Component Id="siginf.exe" Guid="{1B278BD9-6507-4613-9315-8D47CAEBC3D8}">
<File KeyPath="yes" Checksum="yes" Name="siginf.exe" />
+ <File KeyPath="no" Checksum="no" Name="siginf.pdb" />
</Component>
<Component Id="templatesign.exe" Guid="{A24CD56C-F615-406E-B4E2-4AC5EAE99206}">
<File KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
+ <File KeyPath="no" Checksum="no" Name="templatesign.pdb" />
</Component>
<Component Id="txfmout.exe" Guid="{667DD190-335B-4AB7-BBA5-25B5F847F363}">
<File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
+ <File KeyPath="no" Checksum="no" Name="txfmout.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal">
<Component Id="xsecD.dll" Guid="$(var.XmlSec32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
+ <File KeyPath="no" Checksum="no" Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />
</Component>
<Component Id="c14n.exe_debug" Guid="{20506FEA-CCFF-46A2-9753-DBBA8A967003}">
<File Id="c14n.exe_debug" KeyPath="yes" Checksum="yes" Name="c14n.exe" />
+ <File Id="c14n.pdb_debug" KeyPath="no" Checksum="no" Name="c14n.pdb" />
</Component>
<Component Id="checksig.exe_debug" Guid="{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}">
<File Id="checksig.exe_debug" KeyPath="yes" Checksum="yes" Name="checksig.exe" />
+ <File Id="checksig.pdb_debug" KeyPath="no" Checksum="no" Name="checksig.pdb" />
</Component>
<Component Id="cipher.exe_debug" Guid="{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}">
<File Id="cipher.exe_debug" KeyPath="yes" Checksum="yes" Name="cipher.exe" />
+ <File Id="cipher.pdb_debug" KeyPath="no" Checksum="no" Name="cipher.pdb" />
</Component>
<Component Id="siginf.exe_debug" Guid="{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}">
<File Id="siginf.exe_debug" KeyPath="yes" Checksum="yes" Name="siginf.exe" />
+ <File Id="siginf.pdb_debug" KeyPath="no" Checksum="no" Name="siginf.pdb" />
</Component>
<Component Id="templatesign.exe_debug" Guid="{5E8264B4-D759-4502-B989-5A5C56FBD875}">
<File Id="templatesign.exe_debug" KeyPath="yes" Checksum="yes" Name="templatesign.exe" />
+ <File Id="templatesign.pdb_debug" KeyPath="no" Checksum="no" Name="templatesign.pdb" />
</Component>
<Component Id="txfmout.exe_debug" Guid="{FCBFBCAA-5C39-470A-BD58-E558C384898D}">
<File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
+ <File Id="txfmout.pdb_debug" KeyPath="no" Checksum="no" Name="txfmout.pdb" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index 2d8c666..6a5e63d 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -26,11 +26,13 @@
<Directory Id="lib" Name="lib">
<Component Id="zlib1.dll" Guid="$(var.Zlib64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Release\zlib$(var.ZlibFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Release\zlib$(var.ZlibFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="zlib1d.dll" Guid="$(var.Zlib64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\x64\Debug\zlib$(var.ZlibFileVersion)d.pdb" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 0ffd201..156219b 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -26,11 +26,13 @@
<Directory Id="lib" Name="lib">
<Component Id="zlib1.dll" Guid="$(var.Zlib32Component)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="zlib1d.dll" Guid="$(var.Zlib32Componentd)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\Debug\zlib$(var.ZlibFileVersion)d.dll" />
+ <File KeyPath="no" Checksum="no" Source="$(var.BuildDirectory)\$(var.zlib)\Debug\zlib$(var.ZlibFileVersion)d.pdb" />
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 72cccaa..4a8c167 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -24,17 +24,21 @@
<Directory Id="bin64" Name="bin64" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
<Component Id="resolvertest64.exe" Guid="{C29672B6-971D-4828-BB51-1190C0877381}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="resolvertest64.exe" Name="resolvertest.exe" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe" Name="mdquery.exe" />
+ <File KeyPath="no" Checksum="no" Id="mdquery64.pfb" Name="mdquery.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="bin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
<Component Id="resolvertest64.exe_debug" Guid="{58C98426-8C96-41EE-B956-A6BBAEAE5A10}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="resolvertest64.exe_debug" Name="resolvertest.exe" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb_debug" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery64.exe_debug" Guid="{2153EDFC-9962-4AF4-8071-40D0FF497BF9}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe_debug" Name="mdquery.exe" />
+ <File KeyPath="no" Checksum="no" Id="mdquery64.pdb_debug" Name="mdquery.pdb" />
</Component>
</Directory><!-- bin_debug -->
<?endif ?>
@@ -43,74 +47,96 @@
<Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
<Component Id="adfs64.so" Guid="{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="adfs64.so" Name="adfs.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs64.pdb" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite64.so" Guid="{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so" Name="adfs-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib64.dll" Guid="{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll" Name="isapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib64.dll" Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll" Name="iis7_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_2264.so" Guid="{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so" Name="mod_shib_22.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_2464.so" Guid="{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so" Name="mod_shib_24.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb" Name="mod_shib_24.pdb" />
</Component>
<Component Id="odbc_store64.so" Guid="{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="odbc_store64.so" Name="odbc-store.so" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins64.so" Guid="{C78105F1-1258-41A4-8505-5437E90FB1B4}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="plugins64.so" Name="plugins.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins64.pdb" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite64.so" Guid="{83CA3D25-2370-426A-9747-B8A74EFC9037}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so" Name="plugins-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer64.exe" Guid="{5A323F4F-AE87-451A-9253-1965E46C9C5F}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe" Name="shibauthorizer.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder64.exe" Guid="{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe" Name="shibresponder.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb" Name="shibresponder.pdb" />
</Component>
<?endif ?>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib64_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
<Component Id="adfs64.so_debug" Guid="{BFF58DDD-CF04-49B1-A172-C84087705D2A}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="adfs64.so_debug" Name="adfs.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs64.pdb_debug" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite64.so_debug" Guid="{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so_debug" Name="adfs-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb_debug" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib64.dll_debug" Guid="{60BC5679-A40E-42E5-9FC0-CCE924E660ED}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll_debug" Name="isapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb_debug" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib64.dll_debug" Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll_debug" Name="iis7_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb_debug" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_2264.so_debug" Guid="{59FE3C18-1920-48A0-80BC-7ECF8579E441}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so_debug" Name="mod_shib_22.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb_debug" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_2464.so_debug" Guid="{38EE87FE-EA2B-41B4-A457-38A8F84B9866}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so_debug" Name="mod_shib_24.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb_debug" Name="mod_shib_24.pdb" />
</Component>
<Component Id="odbc_store64.so_debug" Guid="{586CE55A-F089-4541-96D5-5EE26F8FC471}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="odbc_store64.so_debug" Name="odbc-store.so" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb_debug" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins64.so_debug" Guid="{E6E051C8-6C84-4CC9-B718-365E627068B6}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="plugins64.so_debug" Name="plugins.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins64.pdb_debug" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite64.so_debug" Guid="{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so_debug" Name="plugins-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb_debug" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer64.exe_debug" Guid="{642C9137-66C8-4E2E-A76C-4D9F65B17157}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe_debug" Name="shibauthorizer.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb_debug" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder64.exe_debug" Guid="{7947F31A-1429-44FC-85B2-BF1E7AA50D20}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe_debug" Name="shibresponder.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb_debug" Name="shibresponder.pdb" />
</Component>
<?endif ?>
</Directory><!-- lib_shibboleth_debug -->
@@ -124,6 +150,7 @@
<Directory Id="sbin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
<Component Id="shibd64.exe_debug" Guid="{657A1902-0104-47C7-84A7-AEB5F736B02F}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibd64.exe_debug" Name="shibd.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibd64.pdb_debug" Name="shibd.pdb" />
</Component>
</Directory><!-- sbin_debug -->
<?endif ?>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index d6739b3..1237838 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -24,17 +24,21 @@
<Directory Id="bin" Name="bin" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
<Component Id="resolvertest.exe" Guid="{D381B6FA-2971-457B-804E-F08DD517866F}">
<File KeyPath="yes" Checksum="yes" Name="resolvertest.exe" />
+ <File KeyPath="no" Checksum="no" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery.exe" Guid="{5F322597-3B26-48E5-95BA-CF991CF6D6DB}">
<File KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
+ <File KeyPath="no" Checksum="no" Name="mdquery.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="bin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">
<File KeyPath="yes" Checksum="yes" Id="resolvertest.exe_debug" Name="resolvertest.exe" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest.pdb_debug" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
<File KeyPath="yes" Checksum="yes" Id="mdquery.exe_debug" Name="mdquery.exe" />
+ <File KeyPath="no" Checksum="no" Id="mdquery.pdb_debug" Name="mdquery.pdb" />
</Component>
</Directory><!-- bin_debug -->
<?endif ?>
@@ -43,84 +47,108 @@
<Directory Id="lib_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
<Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">
<File KeyPath="yes" Checksum="yes" Name="adfs.so" />
+ <File KeyPath="no" Checksum="no" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
<File KeyPath="yes" Checksum="yes" Name="adfs-lite.so" />
+ <File KeyPath="no" Checksum="no" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
<File KeyPath="yes" Checksum="yes" Name="isapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib.dll" Guid="{2DC61347-E3C9-467c-8530-6A369B53C729}">
<File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" />
+ <File KeyPath="no" Checksum="no" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
<File KeyPath="yes" Checksum="yes" Name="mod_shib_22.so" />
+ <File KeyPath="no" Checksum="no" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_24.so" Guid="{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}">
<File KeyPath="yes" Checksum="yes" Name="mod_shib_24.so" />
+ <File KeyPath="no" Checksum="no" Name="mod_shib_24.pdb" />
</Component>
<?if $(var.NSApi) != "" ?>
<Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
<File KeyPath="yes" Checksum="yes" Name="nsapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Name="nsapi_shib.pdb" />
</Component>
<?endif ?>
<Component Id="odbc_store.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
<File KeyPath="yes" Checksum="yes" Name="odbc-store.so" />
+ <File KeyPath="no" Checksum="no" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins.so" Guid="{F738E29B-903B-4C86-BE27-4C72EC69915E}">
<File KeyPath="yes" Checksum="yes" Name="plugins.so" />
+ <File KeyPath="no" Checksum="no" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite.so" Guid="{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}">
<File KeyPath="yes" Checksum="yes" Name="plugins-lite.so" />
+ <File KeyPath="no" Checksum="no" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
<File KeyPath="yes" Checksum="yes" Name="shibauthorizer.exe" />
+ <File KeyPath="no" Checksum="no" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
<File KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
+ <File KeyPath="no" Checksum="no" Name="shibresponder.pdb" />
</Component>
<?endif ?>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="adfs.so_debug" Guid="{9B8E071F-B251-4373-A786-8966FD0D22EF}">
<File KeyPath="yes" Checksum="yes" Id="adfs.so_debug" Name="adfs.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs.pdb_debug" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite.so_debug" Guid="{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite.so_debug" Name="adfs-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite.pdb_debug" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib.dll_debug" Guid="{F8212D30-0BA8-4F02-B595-E8E5D312342B}">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib.dll_debug" Name="isapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib.pdb_debug" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib.dll_debug" Guid="{24FC91C7-1401-4ac1-BC14-E881E47D88BD}">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib.dll_debug" Name="iis7_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib.pdb_debug" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_22.so_debug" Guid="{3DA4492F-C0EA-4286-9C37-13F82342FA67}">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_22.so_debug" Name="mod_shib_22.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_22.pdb_debug" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_24.so_debug" Guid="{E04003DF-8C61-4C9E-87AB-89223C5E65DC}">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_24.so_debug" Name="mod_shib_24.so" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_24.pdb_debug" Name="mod_shib_24.pdb" />
</Component>
<?if $(var.NSApi) != "" ?>
<Component Id="nsapi_shib.dll_debug" Guid="{492A5D72-4FE0-417E-9023-311E1BF34816}">
<File KeyPath="yes" Checksum="yes" Id="nsapi_shib.dll_debug" Name="nsapi_shib.dll" />
+ <File KeyPath="no" Checksum="no" Id="nsapi_shib.pdb_debug" Name="nsapi_shib.pdb" />
</Component>
<?endif ?>
<Component Id="odbc_store.so_debug" Guid="{F217D7CF-91C1-4318-901D-709C710803C6}">
<File KeyPath="yes" Checksum="yes" Id="odbc_store.so_debug" Name="odbc-store.so" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store.pdb_debug" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins.so_debug" Guid="{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}">
<File KeyPath="yes" Checksum="yes" Id="plugins.so_debug" Name="plugins.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins.pdb_debug" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite.so_debug" Guid="{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite.so_debug" Name="plugins-lite.so" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite.pdb_debug" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer.exe_debug" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer.exe_debug" Name="shibauthorizer.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer.pdb_debug" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder.exe_debug" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
<File KeyPath="yes" Checksum="yes" Id="shibresponder.exe_debug" Name="shibresponder.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder.pdb_debug" Name="shibresponder.pdb" />
</Component>
<?endif ?>
</Directory><!-- lib_shibboleth_debug -->
@@ -134,6 +162,7 @@
<Directory Id="sbin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="shibd.exe_debug" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
<File KeyPath="yes" Checksum="yes" Id="shibd.exe_debug" Name="shibd.exe" />
+ <File KeyPath="no" Checksum="no" Id="shibd.pdb_debug" Name="shibd.pdb" />
</Component>
</Directory><!-- sbin_debug -->
<?endif ?>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 6cce224..5805e20 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -185,6 +185,7 @@
<Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
</Component>
<Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Win64="yes" Directory="sbin64">
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index c7c9d1e..d28976e 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -99,6 +99,7 @@
<Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
+ <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
<!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
<ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
<ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list