[cpp-sp] branch maint-2 updated: Fix Xerces paths and add command macros to makefiles.

Scott Cantor cantor.2 at osu.edu
Sun Nov 12 20:32:40 EST 2017 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-2
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=cf695f785532bc4ceecfe5c1dde6bd316ce0ada6

The following commit(s) were added to refs/heads/maint-2 by this push:
       new  cf695f7   Fix Xerces paths and add command macros to makefiles.
cf695f7 is described below

commit cf695f785532bc4ceecfe5c1dde6bd316ce0ada6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Sun Nov 12 20:32:17 2017 -0500

    Fix Xerces paths and add command macros to makefiles.
---
 msi/WiX/Installer.make                 |  51 +++++++------
 msi/WiX/MergeModules/MergeModules.make | 128 +++++++++++++++++----------------
 msi/WiX/MergeModules/Xerces-x64.wxs    |   4 +-
 msi/WiX/MergeModules/Xerces-x86.wxs    |   4 +-
 4 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 8d51397..e92c4bf 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -1,3 +1,8 @@
+LIGHT="C:\Program Files (x86)\WiX Toolset v3.11\bin\light"
+LIT="C:\Program Files (x86)\WiX Toolset v3.11\bin\lit"
+CANDLE="C:\Program Files (x86)\WiX Toolset v3.11\bin\candle"
+WIXCOP="C:\Program Files (x86)\WiX Toolset v3.11\bin\wixcop"
+
 APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so \
 		..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
 APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_13.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
@@ -29,57 +34,57 @@ rebuild64: clean64 all64
 # MSI
 #
 shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib
-	light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+	$(LIGHT) -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
 	del shibboleth-sp-$(ShibbolethVersion)-win64.msi
 
 shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib
-	light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+	$(LIGHT) -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
 
 #
 # Library
 #
 Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
-	lit -pedantic -out  Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
+	$(LIT) -pedantic -out  Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
 
 #
 # Individual files
 #
 ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\x64\Release\plugins.so ..\..\Build\$(MsVCVersion) [...]
-	wixcop -indent:2 ShibbolethSP-exe-x64.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-exe-x64.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs
 
 ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
-	wixcop -indent:2 ShibbolethSP-registry-x64.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-registry-x64.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x64.wxs
 
 ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_install_isapi_filter.vbs-wix ..\scripts\shib_uninstall_isapi_filter.vbs-wix ..\scripts\shib_edit_config_files.vbs-wix
-	wixcop -indent:2 ShibbolethSP-noarch.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-noarch.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
 
 ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs  ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Build\$(MsVCVersion)\Release\plugins-lite.so ..\..\ [...]
-	wixcop -indent:2 ShibbolethSP-exe-x86.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-exe-x86.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs
 
 ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
-	wixcop -indent:2 ShibbolethSP-registry-x86.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-registry-x86.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-registry-x86.wxs
 
 ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
-	wixcop -indent:2 ShibbolethSP-gui.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-gui.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-gui.wxs
 
 ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
-	wixcop -indent:2 ShibbolethSP-update-dlg.wxs
-	candle ShibbolethSP-update-dlg.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-update-dlg.wxs
+	$(CANDLE) ShibbolethSP-update-dlg.wxs
 
 ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
-	wixcop -indent:2 ShibbolethSP-install-dlg.wxs
-	candle ShibbolethSP-install-dlg.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-install-dlg.wxs
+	$(CANDLE) ShibbolethSP-install-dlg.wxs
 
 ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm [...]
-	wixcop -indent:2 ShibbolethSP-main-x64.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-main-x64.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs
 
 ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
-	wixcop -indent:2 ShibbolethSP-main-x86.wxs
-	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs
+	$(WIXCOP) -indent:2 ShibbolethSP-main-x86.wxs
+	$(CANDLE) -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 2796b18..23f6f8d 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -1,3 +1,7 @@
+LIGHT="C:\Program Files (x86)\WiX Toolset v3.11\bin\light"
+CANDLE="C:\Program Files (x86)\WiX Toolset v3.11\bin\candle"
+WIXCOP="C:\Program Files (x86)\WiX Toolset v3.11\bin\wixcop"
+
 all: all32 all64
 
 all32: Curl-x86.msm FastCGI-x86.msm Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm OpenSSL-x86.msm Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm XmlSec-x86.msm Zlib-x86.msm
@@ -20,189 +24,189 @@ rebuild64: clean64 all64
 # CURL 
 #
 Curl-x64.msm: Curl-x64.wixobj 
-	light Curl-x64.wixobj
+	$(LIGHT) Curl-x64.wixobj
 	del ..\*64*.msi
 
 Curl-x64.wixobj: Curl-x64.wxs
-	wixcop -indent:2 Curl-x64.wxs 
-	candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+	$(WIXCOP) -indent:2 Curl-x64.wxs 
+	$(CANDLE) Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
 
 Curl-x86.msm: Curl-x86.wixobj 
-	light Curl-x86.wixobj
+	$(LIGHT) Curl-x86.wixobj
 	del ..\*32*.msi
 
 Curl-x86.wixobj: Curl-x86.wxs
-	wixcop -indent:2 Curl-x86.wxs 
-	candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+	$(WIXCOP) -indent:2 Curl-x86.wxs 
+	$(CANDLE) Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
 
 #
 # FastCGI
 #
 FastCGI-x86.msm: FastCGI-x86.wixobj 
-	light FastCGI-x86.wixobj
+	$(LIGHT) FastCGI-x86.wixobj
 	del ..\*32*.msi
 
 FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Debug\libfcgid.dll 
-	wixcop -indent:2 FastCGI-x86.wxs 
-	candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion) 
+	$(WIXCOP) -indent:2 FastCGI-x86.wxs 
+	$(CANDLE) FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion) 
 
 FastCGI-x64.msm: FastCGI-x64.wixobj 
-	light FastCGI-x64.wixobj
+	$(LIGHT) FastCGI-x64.wixobj
 	del ..\*64*.msi
 
 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) 
+	$(WIXCOP) -indent:2 FastCGI-x64.wxs 
+	$(CANDLE) FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion) 
 
 #
 # Log 4 shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)
 #
 Log4Shib-x64.msm: Log4Shib-x64.wixobj
-	light Log4Shib-x64.wixobj
+	$(LIGHT) Log4Shib-x64.wixobj
 	del ..\*64*.msi
 
 Log4Shib-x86.msm: Log4Shib-x86.wixobj
-	light Log4Shib-x86.wixobj
+	$(LIGHT) Log4Shib-x86.wixobj
 	del ..\*32*.msi
 
 Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
-	wixcop -indent:2 Log4Shib-x86.wxs 
-	candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d) -dShibbolethMsVersion=$(MsVCVersion)
+	$(WIXCOP) -indent:2 Log4Shib-x86.wxs 
+	$(CANDLE) Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d) -dShibbolethMsVersion=$(MsVCVersion)
 
 Log4Shib-x64.wixobj: Log4Shib-x64.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
-	wixcop -indent:2 Log4Shib-x64.wxs 
-	candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
+	$(WIXCOP) -indent:2 Log4Shib-x64.wxs 
+	$(CANDLE) Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
 
 #
 # OpenSAML
 #
 OpenSAML-x86.msm: OpenSAML-x86.wixobj
-	light OpenSAML-x86.wixobj
+	$(LIGHT) OpenSAML-x86.wixobj
 	del ..\*32*.msi
 
 OpenSAML-x64.msm: OpenSAML-x64.wixobj
-	light OpenSAML-x64.wixobj
+	$(LIGHT) OpenSAML-x64.wixobj
 	del ..\*64*.msi
 
 OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debu [...]
-	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) -dShibbo [...]
+	$(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) -dShi [...]
 
 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\$(M [...]
-	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)  -dShibb [...]
+	$(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)  -dSh [...]
 
 OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
-	light OpenSAML-schemas.wixobj
+	$(LIGHT) OpenSAML-schemas.wixobj
 	del ..\*.msi
 
 OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs
-	wixcop -indent:2 OpenSAML-schemas.wxs 
-	candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) 
+	$(WIXCOP) -indent:2 OpenSAML-schemas.wxs 
+	$(CANDLE) OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) 
 
 #
 # OpenSSL
 #
 OpenSSL-x86.msm: OpenSSL-x86.wixobj
-	light OpenSSL-x86.wixobj
+	$(LIGHT) OpenSSL-x86.wixobj
 	del ..\*32*.msi
 
 OpenSSL-x64.msm: OpenSSL-x64.wixobj
-	light OpenSSL-x64.wixobj
+	$(LIGHT) OpenSSL-x64.wixobj
 	del ..\*64*.msi
 
 OpenSSL-x86.wixobj: OpenSSL-x86.wxs
-	wixcop -indent:2 OpenSSL-x86.wxs 
-	candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+	$(WIXCOP) -indent:2 OpenSSL-x86.wxs 
+	$(CANDLE) OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
 
 OpenSSL-x64.wixobj: OpenSSL-x64.wxs
-	wixcop -indent:2 OpenSSL-x64.wxs 
-	candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+	$(WIXCOP) -indent:2 OpenSSL-x64.wxs 
+	$(CANDLE) OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
 
 #
 # Shibboleth DLL
 #
 Shibboleth-x86.msm: Shibboleth-x86.wixobj
-	light Shibboleth-x86.wixobj
+	$(LIGHT) Shibboleth-x86.wixobj
 	del ..\*32*.msi
 
 Shibboleth-x64.msm: Shibboleth-x64.wixobj
-	light Shibboleth-x64.wixobj
+	$(LIGHT) Shibboleth-x64.wixobj
 	del ..\*64*.msi
 
 Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.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)
+	$(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)
 
 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
-	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)
+	$(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)
 
 Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
-	light Shibboleth-schemas.wixobj
+	$(LIGHT) Shibboleth-schemas.wixobj
 
 Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs
-	wixcop -indent:2 Shibboleth-schemas.wxs 
-	candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) 
+	$(WIXCOP) -indent:2 Shibboleth-schemas.wxs 
+	$(CANDLE) Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) 
 
 
 #
 # Xerces
 #
 Xerces-x86.msm: Xerces-x86.wixobj
-	light Xerces-x86.wixobj
+	$(LIGHT) Xerces-x86.wixobj
 	del ..\*32*.msi
 
 Xerces-x64.msm: Xerces-x64.wixobj
-	light Xerces-x64.wixobj
+	$(LIGHT) Xerces-x64.wixobj
 	del ..\*64*.msi
 
-Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win32\$(MsVCVersion)\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win32\$(MsVCVersion)\Debug\xerces-c_$(XercesFileVersion)D.dll
-	wixcop -indent:2 Xerces-x86.wxs 
-	candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) -dShibbolethMsVersion=$(MsVCVersion) 
+Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\buildx86\$(MsVCVersion)\src\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\buildx86\$(MsVCVersion)\src\Debug\xerces-c_$(XercesFileVersion)D.dll
+	$(WIXCOP) -indent:2 Xerces-x86.wxs 
+	$(CANDLE) Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) -dShibbolethMsVersion=$(MsVCVersion) 
 
-Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win64\$(MsVCVersion)\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win64\$(MsVCVersion)\Debug\xerces-c_$(XercesFileVersion)D.dll
-	wixcop -indent:2 Xerces-x64.wxs 
-	candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion) 
+Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)\buildx64\$(MsVCVersion)\src\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\buildx64\$(MsVCVersion)\src\Debug\xerces-c_$(XercesFileVersion)D.dll
+	$(WIXCOP) -indent:2 Xerces-x64.wxs 
+	$(CANDLE) Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion) 
 
 
 #
 # XmlSec
 #
 XmlSec-x86.msm: XmlSec-x86.wixobj
-	light XmlSec-x86.wixobj
+	$(LIGHT) XmlSec-x86.wixobj
 	del ..\*32*.msi
 
 XmlSec-x64.msm: XmlSec-x64.wixobj
-	light XmlSec-x64.wixobj
+	$(LIGHT) XmlSec-x64.wixobj
 	del ..\*64*.msi
 
 XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVers [...]
-	wixcop -indent:2 XmlSec-x86.wxs 
-	candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+	$(WIXCOP) -indent:2 XmlSec-x86.wxs 
+	$(CANDLE) XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
 
 XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Bui [...]
-	wixcop -indent:2 XmlSec-x64.wxs 
-	candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+	$(WIXCOP) -indent:2 XmlSec-x64.wxs 
+	$(CANDLE) XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
 
 #
 # ZLIB
 #
 
 zlib-x86.msm: zlib-x86.wixobj
-	light zlib-x86.wixobj
+	$(LIGHT) zlib-x86.wixobj
 	del ..\*32*.msi
 
 zlib-x64.msm: zlib-x64.wixobj
-	light zlib-x64.wixobj
+	$(LIGHT) zlib-x64.wixobj
 	del ..\*64*.msi
 
 zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll
-	wixcop -indent:2 zlib-x86.wxs 
-	candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd)
+	$(WIXCOP) -indent:2 zlib-x86.wxs 
+	$(CANDLE) zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd)
 
 zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll
-	wixcop -indent:2 zlib-x64.wxs 
-	candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)
+	$(WIXCOP) -indent:2 zlib-x64.wxs 
+	$(CANDLE) zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)
 
 #
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 6a6af3b..a7d0a3a 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -28,12 +28,12 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\buildx64\$(var.ShibbolethMsVersion)\src\Release\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\buildx64\$(var.ShibbolethMsVersion)\src\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index ee80178..7fcd325 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -28,12 +28,12 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\buildx86\$(var.ShibbolethMsVersion)\src\Release\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\buildx86\$(var.ShibbolethMsVersion)\src\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list