[cpp-sp] 02/02: SSPCPP-782 Remove Debug executables from the installer
Rod Widdowson
rdw at steadingsoftware.com
Thu Mar 15 10:52:19 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=ffbc6da89f9d43d5c6f5027a18991c7cb76c9a34
commit ffbc6da89f9d43d5c6f5027a18991c7cb76c9a34
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Mar 12 15:15:11 2018 +0000
SSPCPP-782 Remove Debug executables from the installer
https://issues.shibboleth.net/jira/browse/SSPCPP-782
We (I) want to be able to still build an installer with the dbg executables
so just use a wix variable (driver from an environmental variable) to include
the dbg versions.
---
Projects/vc15/wix/Installer.vcxproj | 10 +--
Projects/vc15/wix/MergeModules.vcxproj | 6 +-
msi/WiX/Installer.make | 44 ++++++--------
msi/WiX/MergeModules/Curl-x64.wxs | 2 +
msi/WiX/MergeModules/Curl-x86.wxs | 2 +
msi/WiX/MergeModules/FastCGI-x64.wxs | 2 +
msi/WiX/MergeModules/FastCGI-x86.wxs | 2 +
msi/WiX/MergeModules/Log4Shib-x64.wxs | 2 +
msi/WiX/MergeModules/Log4Shib-x86.wxs | 2 +
msi/WiX/MergeModules/MergeModules.make | 104 +++++++++++++-------------------
msi/WiX/MergeModules/OpenSAML-x64.wxs | 2 +
msi/WiX/MergeModules/OpenSAML-x86.wxs | 2 +
msi/WiX/MergeModules/OpenSSL-x64.wxs | 2 +
msi/WiX/MergeModules/OpenSSL-x86.wxs | 2 +
msi/WiX/MergeModules/Shibboleth-x64.wxs | 2 +
msi/WiX/MergeModules/Shibboleth-x86.wxs | 2 +
msi/WiX/MergeModules/Xerces-x64.wxs | 2 +
msi/WiX/MergeModules/Xerces-x86.wxs | 2 +
msi/WiX/MergeModules/XmlSec-x64.wxs | 2 +
msi/WiX/MergeModules/XmlSec-x86.wxs | 2 +
msi/WiX/MergeModules/Zlib-x64.wxs | 2 +
msi/WiX/MergeModules/Zlib-x86.wxs | 2 +
msi/WiX/ShibbolethSP-defs-x86.wxi | 4 ++
msi/WiX/ShibbolethSP-exe-x64.wxs | 6 ++
msi/WiX/ShibbolethSP-exe-x86.wxs | 6 ++
msi/WiX/ShibbolethSP-main-x64.wxs | 12 ++++
msi/WiX/ShibbolethSP-main-x86.wxs | 4 ++
27 files changed, 138 insertions(+), 94 deletions(-)
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index 1cc17b0..b2d4fcb 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -56,26 +56,26 @@ nmake /f Installer.make clean</NMakeBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all32</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" DebugInstaller=$(DEBUG_INSTALLER) all32</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *86.wixobj
del *86.msi
del *.wixlib
del *x86.wixpdb</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild32</NMakeReBuildCommandLine>
+ <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" DebugInstaller=$(DEBUG_INSTALLER) rebuild32</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) CppVCVersion=$(CppVCVersion) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all64</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) CppVCVersion=$(CppVCVersion) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" DebugInstaller=$(DEBUG_INSTALLER) all64</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *64.wixobj
del *64.msmi
del *.wixlib
del *64.wixpdb</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild64</NMakeReBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" DebugInstaller=$(DEBUG_INSTALLER) rebuild64</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
@@ -101,4 +101,4 @@ nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ Sh
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index 2989ee0..cedcb27 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -58,7 +58,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) log4shib=$(log4shib) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ O [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) log4shib=$(log4shib) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ O [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *86.wixobj
del *86.msm
@@ -67,7 +67,7 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ [...]
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
@@ -126,4 +126,4 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlF
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 9b17f85..a4b394b 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -1,23 +1,17 @@
+!if "$(DEBUG_INSTALLER)" != ""
APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so \
..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
-
-!If "$(MsVCVersion)" == "vc10"
-NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Debug\nsapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
-FCGI86=MergeModules\FastCGI-x86.msm
-FCGI64=MergeModules\FastCGI-x64.msm
-FCGI_AUTH_RESP86= ..\..\Build\$(MsVCVersion)\Release\shibauthorizer.exe\
- ..\..\Build\$(MsVCVersion)\Release\shibresponder.exe\
- ..\..\Build\$(MsVCVersion)\Debug\shibauthorizer.exe\
- ..\..\Build\$(MsVCVersion)\Debug\shibresponder.exe
-FCGI_AUTH_RESP64=..\..\Build\$(MsVCVersion)\x64\Release\shibauthorizer.exe\
- ..\..\Build\$(MsVCVersion)\x64\Release\shibresponder.exe\
- ..\..\Build\$(MsVCVersion)\x64\Debug\shibauthorizer.exe\
- ..\..\Build\$(MsVCVersion)\x64\Debug\shibresponder.exe\
!else
+APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
+APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
+!endif
+
+!If "$(MsVCVersion)" == "vc10"
+!Error MSVC 10 not supported
!Endif
!If "$(CppMmDir)" == ""
@@ -62,42 +56,42 @@ Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj Shibbo
#
# Individual files
#
-ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\iis7_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersi [...]
+ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\iis7_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersi [...]
wixcop -indent:2 ShibbolethSP-exe-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs -dFCGI="$(FCGI_AUTH_RESP64)"
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs -dFCGI="$(FCGI_AUTH_RESP64)" -dBuildDebug=$(DebugInstaller)
ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
wixcop -indent:2 ShibbolethSP-registry-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs -dBuildDebug=$(DebugInstaller)
ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_edit_config_files.vbs-wix
wixcop -indent:2 ShibbolethSP-noarch.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs -dBuildDebug=$(DebugInstaller)
-ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\iis7_shib.dll ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Bu [...]
+ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\iis7_shib.dll ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Bu [...]
wixcop -indent:2 ShibbolethSP-exe-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs -dNSApi="$(NSAPI_DLLS)" -dFCGI="$(FCGI_AUTH_RESP86)"
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs -dNSApi="$(NSAPI_DLLS)" -dFCGI="$(FCGI_AUTH_RESP86)" -dBuildDebug=$(DebugInstaller)
ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
wixcop -indent:2 ShibbolethSP-registry-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs -dBuildDebug=$(DebugInstaller)
ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
wixcop -indent:2 ShibbolethSP-gui.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs -dBuildDebug=$(DebugInstaller)
ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
wixcop -indent:2 ShibbolethSP-update-dlg.wxs
- candle ShibbolethSP-update-dlg.wxs
+ candle ShibbolethSP-update-dlg.wxs -dBuildDebug=$(DebugInstaller)
ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
wixcop -indent:2 ShibbolethSP-install-dlg.wxs
- candle ShibbolethSP-install-dlg.wxs
+ candle ShibbolethSP-install-dlg.wxs -dBuildDebug=$(DebugInstaller)
ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm $(FCGI64) MergeModules\Log4Shib-x64.msm MergeMo [...]
wixcop -indent:2 ShibbolethSP-main-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion)
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
wixcop -indent:2 ShibbolethSP-main-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion)
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 92e7553..38bcb3f 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -37,6 +37,7 @@
<Component Id="curl.exe" Guid="{52103377-AEF6-4533-B0CE-D3A786D2D17E}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
@@ -45,6 +46,7 @@
<File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="CURL.LICENSE" Guid="{838175A6-8CC3-45D3-9A5E-C4C4147076E9}" Win64="yes">
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 76ca7cc..055922a 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -36,6 +36,7 @@
<Component Id="curl.exe" Guid="{67A6F011-9715-43C2-92F1-70FE53E935AD}">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="libcurl5d.dll" Guid="$(var.LibCurlGuid32d)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll" />
@@ -44,6 +45,7 @@
<File Id="curl.exe_debug" KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="CURL.LICENSE" Guid="{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}">
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 3331b19..d5f2aa4 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -28,11 +28,13 @@
<Component Id="libfcgi.dll" Guid="{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Release\libfcgi.dll" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="libfcgid.dll" Guid="{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Debug\libfcgid.dll" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="FASTCGI.LICENSE" Guid="{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}" Win64="yes">
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 5e5e96c..225a7a9 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -28,11 +28,13 @@
<Component Id="libfcgi.dll" Guid="{FD6F8E32-CBDF-4662-A39C-8EC713483C51}">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Release\libfcgi.dll" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug">
<Component Id="libfcgid.dll" Guid="{682FFA3A-D517-4332-BCC5-EF24252C3528}">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Debug\libfcgid.dll" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="FASTCGI.LICENSE" Guid="{3FB61369-D8A7-4076-B659-DEDA2558A1AF}">
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 9b48715..bcdea39 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -31,6 +31,7 @@
<Component Id="NTEventLogAppender.dll" Guid="{1A559035-DCA4-4297-AE94-C3E6ABB37662}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\x64\Debug\">
<Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent64d)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
@@ -39,6 +40,7 @@
<File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="LOG4SHIB.LICENSE" Guid="{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}" Win64="yes">
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 6ba9390..374693d 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -31,6 +31,7 @@
<Component Id="NTEventLogAppender.dll" Guid="{43B944CB-E42A-4D17-A601-AC4E14DA2217}">
<File KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.log4shib)\ms$(var.ShibbolethMsVersion)\Debug\">
<Component Id="log4shibD.dll" Guid="$(var.Log4ShibComponent32d)">
<File KeyPath="yes" Checksum="yes" Name="log4shib$(var.Log4ShibFileVersion)D.dll" />
@@ -39,6 +40,7 @@
<File Id="NTEventLogAppender.dll_debug" KeyPath="yes" Checksum="yes" Name="NTEventLogAppender.dll" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="LOG4CPP.LICENSE" Guid="{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}">
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 0614b2d..51ccb1c 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -31,7 +31,8 @@ Curl-x64.wixobj: Curl-x64.wxs
wixcop -indent:2 Curl-x64.wxs
candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
-dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
- -dLibCurlGuid64=$(LibCurlGuid64) -dLibCurlGuid64d=$(LibCurlGuid64d)
+ -dLibCurlGuid64=$(LibCurlGuid64) -dLibCurlGuid64d=$(LibCurlGuid64d)\
+ -dBuildDebug=$(DebugInstaller)
Curl-x86.msm: Curl-x86.wixobj
light Curl-x86.wixobj
@@ -41,7 +42,8 @@ Curl-x86.wixobj: Curl-x86.wxs
wixcop -indent:2 Curl-x86.wxs
candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
-dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
- -dLibCurlGuid32=$(LibCurlGuid32) -dLibCurlGuid32d=$(LibCurlGuid32d)
+ -dLibCurlGuid32=$(LibCurlGuid32) -dLibCurlGuid32d=$(LibCurlGuid32d)\
+ -dBuildDebug=$(DebugInstaller)
#
# FastCGI
@@ -50,11 +52,10 @@ FastCGI-x86.msm: FastCGI-x86.wixobj
light FastCGI-x86.wixobj
FastCGI-x86.wixobj: FastCGI-x86.wxs\
- $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll \
- $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Debug\libfcgid.dll
+ $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll
wixcop -indent:2 FastCGI-x86.wxs
candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
- -dShibbolethMsVersion=$(MsVCVersion)
+ -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
FastCGI-x64.msm: FastCGI-x64.wixobj
light FastCGI-x64.wixobj
@@ -62,10 +63,9 @@ FastCGI-x64.msm: FastCGI-x64.wixobj
FastCGI-x64.wixobj: FastCGI-x64.wxs\
$(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Release\libfcgi.dll
- $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Debug\libfcgid.dll
wixcop -indent:2 FastCGI-x64.wxs
candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
- -dShibbolethMsVersion=$(MsVCVersion)
+ -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
#
# Log 4 shib. More complicated since it has a version and a file version (and hence 2 components per architecture)
@@ -79,21 +79,20 @@ Log4Shib-x86.msm: Log4Shib-x86.wixobj
del ..\*32*.msi
Log4Shib-x86.wixobj: Log4Shib-x86.wxs\
- $(BuildSP)\$(log4shib)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll\
$(BuildSP)\$(log4shib)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
wixcop -indent:2 Log4Shib-x86.wxs
candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dlog4shib=$(log4shib)\
-dLog4ShibFileVersion=$(Log4ShibFileVersion)\
-dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\
- -dShibbolethMsVersion=$(MsVCVersion)
+ -dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
Log4Shib-x64.wixobj: Log4Shib-x64.wxs\
- $(BuildSP)\$(log4shib)\ms$(MsVCVersion)\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll\
$(BuildSP)\$(log4shib)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
wixcop -indent:2 Log4Shib-x64.wxs
- candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion)\
- -dlog4shib=$(log4shib)\
- -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
+ candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion)\
+ -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dlog4shib=$(log4shib)\
+ -dLog4ShibComponent64=$(Log4ShibComponent64) -dBuildDebug=$(DebugInstaller)\
+ -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
#
# OpenSAML
@@ -108,29 +107,25 @@ OpenSAML-x64.msm: OpenSAML-x64.wixobj
OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll\
$(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling$(XmlToolingFileVersion)d.dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Debug\saml$(OpenSAMLFileVersion)d.dll
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll
wixcop -indent:2 OpenSAML-x86.wxs
candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
-dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32)\
-dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32)\
-dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) \
- -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbolethMsVersion=$(MsVCVersion)
+ -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbolethMsVersion=$(MsVCVersion)\
+ -dBuildDebug=$(DebugInstaller)
OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling$(XmlToolingFileVersion).dll\
$(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Release\saml$(OpenSAMLFileVersion).dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll\
- $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll\
- $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Debug\saml$(OpenSAMLFileVersion)d.dll
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Release\saml$(OpenSAMLFileVersion).dll
wixcop -indent:2 OpenSAML-x64.wxs
candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
-dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64)\
-dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64)\
-dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d)\
- -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
+ -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibbolethMsVersion=$(MsVCVersion)\
+ -dBuildDebug=$(DebugInstaller)
OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
light OpenSAML-schemas.wixobj
@@ -155,13 +150,16 @@ OpenSSL-x86.wixobj: OpenSSL-x86.wxs
wixcop -indent:2 OpenSSL-x86.wxs
candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
-dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component)\
- -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dopenssl=$(openssl)
+ -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dopenssl=$(openssl)\
+ -dBuildDebug=$(DebugInstaller)
OpenSSL-x64.wixobj: OpenSSL-x64.wxs
wixcop -indent:2 OpenSSL-x64.wxs
candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
-dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component)\
- -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd) -dopenssl=$(openssl)
+ -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd)\
+ -dSSlEay64Componentd=$(SSlEay64Componentd) -dopenssl=$(openssl)\
+ -dBuildDebug=$(DebugInstaller)
#
# Shibboleth DLL
@@ -175,24 +173,20 @@ Shibboleth-x64.msm: Shibboleth-x64.wixobj
del ..\*64*.msi
Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll\
- $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+ $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll
wixcop -indent:2 Shibboleth-x86.wxs
candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
-dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component)\
-dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd)\
- -dShibDllLite32Componentd=$(ShibDllLite32Componentd)
+ -dShibDllLite32Componentd=$(ShibDllLite32Componentd) -dBuildDebug=$(DebugInstaller)
Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll\
- $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll\
- $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+ $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll
wixcop -indent:2 Shibboleth-x64.wxs
candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
-dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component)\
-dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd)\
- -dShibDllLite64Componentd=$(ShibDllLite64Componentd)
+ -dShibDllLite64Componentd=$(ShibDllLite64Componentd) -dBuildDebug=$(DebugInstaller)
Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
light Shibboleth-schemas.wixobj
@@ -216,22 +210,22 @@ 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
-Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs $(XercesDebugDll32)
+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)
+ -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)
XercesDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
XercesDebugDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
-Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs $(XercesDebugDll64)
+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)
+ -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)
#
@@ -251,17 +245,11 @@ XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersio
"$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\cipher.exe"\
"$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\siginf.exe"\
"$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\txfmout.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\c14n.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\checksig.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\cipher.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\siginf.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\txfmout.exe"
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\txfmout.exe"
wixcop -indent:2 XmlSec-x86.wxs
candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
- -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
+ -dBuildDebug=$(DebugInstaller)
XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\c14n.exe"\
@@ -269,17 +257,11 @@ XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\cipher.exe"\
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\siginf.exe"\
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\txfmout.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\c14n.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\checksig.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\cipher.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\siginf.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\txfmout.exe"
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\txfmout.exe"
wixcop -indent:2 XmlSec-x64.wxs
candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
- -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
+ -dBuildDebug=$(DebugInstaller)
#
# ZLIB
@@ -293,16 +275,16 @@ zlib-x64.msm: zlib-x64.wixobj
light zlib-x64.wixobj
del ..\*64*.msi
-zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\$(zlib)\Release\zlib$(ZlibFileVersion).dll \
- $(BuildSP)\$(zlib)\Debug\zlib$(ZlibFileVersion)d.dll
+zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\$(zlib)\Release\zlib$(ZlibFileVersion).dll
wixcop -indent:2 zlib-x86.wxs
candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
- -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd) -dzlib=$(zlib)
+ -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd) -dzlib=$(zlib)\
+ -dBuildDebug=$(DebugInstaller)
-zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\$(zlib)\x64\Release\zlib$(ZlibFileVersion).dll\
- $(BuildSP)\$(zlib)\x64\Debug\zlib$(ZlibFileVersion)d.dll
+zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\$(zlib)\x64\Release\zlib$(ZlibFileVersion).dll
wixcop -indent:2 zlib-x64.wxs
candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
- -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd) -dzlib=$(zlib)
+ -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd) -dzlib=$(zlib)\
+ -dBuildDebug=$(DebugInstaller)
#
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index c35bba8..02b8dc9 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -37,6 +37,7 @@
<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>
+ <?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" />
@@ -51,6 +52,7 @@
<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 -->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="doc" Guid="{F858AC39-4C24-4255-A86E-4747FE45624E}" Win64="yes">
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index bbda73c..e1f1e71 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -37,6 +37,7 @@
<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>
+ <?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" />
@@ -51,6 +52,7 @@
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
</Component>
</Directory><!-- lib_debug -->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="doc" Guid="{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}">
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 7c901d4..d497eb1 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -40,6 +40,7 @@
<Component Id="openssl.exe" Guid="{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
<Component Id="libeay32D.dll" Guid="$(var.LibEay64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
@@ -51,6 +52,7 @@
<File Id="openssl.exe_debug" KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="OPENSSL.LICENSE" Guid="{10B77A21-E554-47F2-99F0-7171304FE899}" Win64="yes">
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index ae80802..2667193 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -42,6 +42,7 @@
<Component Id="openssl.exe" Guid="{886F0254-AD10-45C6-A723-37C7FA466651}">
<File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
<Component Id="libeay32D.dll" Guid="$(var.LibEay32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
@@ -53,6 +54,7 @@
<File Id="openssl.exe_debug" KeyPath="yes" Checksum="yes" Name="openssl.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="OPENSSL.LICENSE" Guid="{CEC1CC66-6D48-475A-8C99-B687B0B901AA}">
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 4053ac8..6c7fbd4 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -30,6 +30,7 @@
<Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
</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" />
@@ -38,6 +39,7 @@
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
</Component>
</Directory><!-- lib_debug -->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="doc" Guid="{1ACB430F-7846-4565-93FE-3BE1BC1235C1}" Win64="yes">
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 47a2648..73c19f0 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -30,6 +30,7 @@
<Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite32Component)">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
</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" />
@@ -38,6 +39,7 @@
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
</Component>
</Directory><!-- lib_debug -->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="doc" Guid="{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}">
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 5123bb4..fa95a0c 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -27,11 +27,13 @@
<Component Id="xercesc.dll" Guid="$(var.Xerces64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
</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)" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="XERCES.LICENSE" Guid="{12731F0B-681B-4154-9B02-BEB219954D44}" Win64="yes">
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 4270cdb..905d9c8 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -27,11 +27,13 @@
<Component Id="xercesc.dll" Guid="$(var.Xerces32Component)">
<File KeyPath="yes" Checksum="yes" Source="$(var.XercesDll)" />
</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)" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="XERCES.LICENSE" Guid="{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}">
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 33c7f55..2a1a3f1 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -45,6 +45,7 @@
<Component Id="txfmout.exe" Guid="{2D9025EE-D95F-4D3C-B0E7-86D742749D39}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</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" />
@@ -68,6 +69,7 @@
<File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="SANTUARIO.LICENSE" Guid="{07288B10-ED5A-443F-BC90-CFD987C798C4}" Win64="yes">
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 3561ffd..008b582 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -45,6 +45,7 @@
<Component Id="txfmout.exe" Guid="{667DD190-335B-4AB7-BBA5-25B5F847F363}">
<File KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</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" />
@@ -68,6 +69,7 @@
<File Id="txfmout.exe_debug" KeyPath="yes" Checksum="yes" Name="txfmout.exe" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
<Directory Id="doc" Name="doc">
<Component Id="SANTUARIO.LICENSE" Guid="{FF81AD29-36DF-42BD-AFC9-211F083D9872}">
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index 0282fcb..f376e64 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -27,11 +27,13 @@
<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>
+ <?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" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
</Directory><!-- shibboleth_sp -->
</Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 1c04ad8..6fa4266 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -27,11 +27,13 @@
<Component Id="zlib1.dll" Guid="$(var.Zlib32Component)">
<File KeyPath="yes" Checksum="yes" Source="$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).dll" />
</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" />
</Component>
</Directory><!-- lib_debug-->
+ <?endif ?>
</Directory><!-- lib -->
</Directory><!-- shibboleth_sp -->
</Directory><!-- shibboleth -->
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index caf14b0..729be46 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -43,8 +43,10 @@
<ComponentRef Id="resolvertest.exe" />
<ComponentRef Id="mdquery.exe" />
+ <?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="resolvertest.exe_debug" />
<ComponentRef Id="mdquery.exe_debug" />
+ <?endif ?>
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
@@ -63,6 +65,7 @@
<ComponentRef Id="shibresponder.exe" />
<?endif ?>
+ <?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="adfs.so_debug" />
<ComponentRef Id="adfs_lite.so_debug" />
<ComponentRef Id="isapi_shib.dll_debug" />
@@ -81,6 +84,7 @@
<?endif ?>
<ComponentRef Id="shibd.exe_debug" />
+ <?endif ?>
<!-- ShibbolethSP-registry-x32 -->
<ComponentRef Id="TargetDir" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index aa2ffb8..72cccaa 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -28,6 +28,7 @@
<Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe" Name="mdquery.exe" />
</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" />
@@ -36,6 +37,7 @@
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe_debug" Name="mdquery.exe" />
</Component>
</Directory><!-- bin_debug -->
+ <?endif ?>
</Directory><!-- bin -->
<Directory Id="lib64" Name="lib64">
<Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
@@ -74,6 +76,7 @@
<File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe" Name="shibresponder.exe" />
</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" />
@@ -111,16 +114,19 @@
</Component>
<?endif ?>
</Directory><!-- lib_shibboleth_debug -->
+ <?endif ?>
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
<Directory Id="sbin64" Name="sbin64" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
<!-- Service bins are declared in main -->
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="sbin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
<Component Id="shibd64.exe_debug" Guid="{657A1902-0104-47C7-84A7-AEB5F736B02F}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Id="shibd64.exe_debug" Name="shibd.exe" />
</Component>
</Directory><!-- sbin_debug -->
+ <?endif ?>
</Directory><!-- sbin -->
</DirectoryRef><!-- INSTALLDIR -->
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index 46d3060..d6739b3 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -28,6 +28,7 @@
<Component Id="mdquery.exe" Guid="{5F322597-3B26-48E5-95BA-CF991CF6D6DB}">
<File KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
</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" />
@@ -36,6 +37,7 @@
<File KeyPath="yes" Checksum="yes" Id="mdquery.exe_debug" Name="mdquery.exe" />
</Component>
</Directory><!-- bin_debug -->
+ <?endif ?>
</Directory><!-- bin -->
<Directory Id="lib" Name="lib">
<Directory Id="lib_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
@@ -79,6 +81,7 @@
<File KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
</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" />
@@ -121,16 +124,19 @@
</Component>
<?endif ?>
</Directory><!-- lib_shibboleth_debug -->
+ <?endif ?>
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
<Directory Id="sbin" Name="sbin" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
<!-- Service bin is installed in main-x86 (with service) and main-64 (without) -->
+ <?if $(var.BuildDebug) != "" ?>
<Directory Id="sbin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="shibd.exe_debug" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
<File KeyPath="yes" Checksum="yes" Id="shibd.exe_debug" Name="shibd.exe" />
</Component>
</Directory><!-- sbin_debug -->
+ <?endif ?>
</Directory><!-- sbin -->
</DirectoryRef><!-- INSTALLDIR -->
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 16958c7..ea33ec1 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -60,7 +60,9 @@
<Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
<Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
<Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
<Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <?endif ?>
<Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
</Directory><!--ProgramFilesFolder-->
@@ -77,7 +79,9 @@
<Merge Id="XercesMergeModule_x64" Language="1033" SourceFile="MergeModules\Xerces-x64.msm" DiskId="1" />
<Merge Id="XmlSecMergeModule_x64" Language="1033" SourceFile="MergeModules\XmlSec-x64.msm" DiskId="1" />
<Merge Id="ZlibMergeModule_x64" Language="1033" SourceFile="MergeModules\Zlib-x64.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
<Merge Id="Microsoft_DebugCRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm" DiskId="1" />
+ <?endif ?>
<Merge Id="Microsoft_CRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x64.msm" DiskId="1" />
</Directory><!--ProgramFiles64Folder-->
@@ -105,7 +109,9 @@
<MergeRef Id="XmlSecMergeModule_x86" />
<MergeRef Id="ZlibMergeModule_x86" />
+ <?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x86" />
+ <?endif ?>
<MergeRef Id="Microsoft_CRT_x86" />
<MergeRef Id="CurlMergeModule_x64" />
@@ -120,15 +126,19 @@
<MergeRef Id="XmlSecMergeModule_x64" />
<MergeRef Id="ZlibMergeModule_x64" />
+ <?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x64" />
+ <?endif ?>
<MergeRef Id="Microsoft_CRT_x64" />
<!-- ShibbolethSP-exe-x64-->
<ComponentRef Id="resolvertest64.exe" />
<ComponentRef Id="mdquery64.exe" />
+ <?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="resolvertest64.exe_debug" />
<ComponentRef Id="mdquery64.exe_debug" />
+ <?endif ?>
<ComponentRef Id="adfs64.so" />
<ComponentRef Id="adfs_lite64.so" />
@@ -144,6 +154,7 @@
<ComponentRef Id="shibresponder64.exe" />
<?endif ?>
+ <?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="adfs64.so_debug" />
<ComponentRef Id="adfs_lite64.so_debug" />
<ComponentRef Id="isapi_shib64.dll_debug" />
@@ -159,6 +170,7 @@
<?endif ?>
<ComponentRef Id="shibd64.exe_debug" />
+ <?endif ?>
<!-- ShibbolethSP-registry-x64 -->
<ComponentRef Id="TargetDir64" />
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 8274cdb..3882195 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -61,7 +61,9 @@
<Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
<Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
<Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
<Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <?endif ?>
<Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
</Directory><!--ProgramFilesFolder-->
@@ -85,7 +87,9 @@
<MergeRef Id="XmlSecMergeModule_x86" />
<MergeRef Id="ZlibMergeModule_x86" />
+ <?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x86" />
+ <?endif ?>
<MergeRef Id="Microsoft_CRT_x86" />
<!-- ShibbolethSP-main-x86 -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list