SSPCPP-506 - Add NMAKE file and controlling vcxpr [oject] file to build the mergemodu...

https://issues.shibboleth.net/jira/browse/SSPCPP-506

diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
new file mode 100644 (file)
index 0000000..b7a22ef
--- /dev/null
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -0,0 +1,177 @@
+all: all32 all64\r
+\r
+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\r
+\r
+all64: Curl-x64.msm FastCGI-x64.msm Log4shib-x64.msm OpenSAML-x64.msm OpenSAML-schemas.msm OpenSSL-x64.msm Shibboleth-x64.msm Shibboleth-schemas.msm Xerces-x64.msm XmlSec-x64.msm Zlib-x64.msm\r
+\r
+clean32: \r
+       del *-x86.msm *-x86.wixobj *-x86.wixpdb *schemas.wixobj *schemas.msm\r
+\r
+clean64: \r
+       del *-x64.wixobj *-x64.msm *-x64.wixpdb *schemas.wixobj *schemas.msm\r
+\r
+clean: clean32 clean64\r
+\r
+rebuild32: clean32 all32\r
+\r
+rebuild64: clean64 all64\r
+\r
+#\r
+# CURL \r
+#\r
+Curl-x64.msm: Curl-x64.wixobj \r
+       light Curl-x64.wixobj\r
+       del ..\*.msi\r
+\r
+Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll\r
+       candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\r
+\r
+Curl-x86.msm: Curl-x86.wixobj \r
+       light Curl-x86.wixobj\r
+       del ..\*.msi\r
+\r
+Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll\r
+       candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\r
+\r
+#\r
+# FastCGI\r
+#\r
+FastCGI-x86.msm: FastCGI-x86.wixobj \r
+       light FastCGI-x86.wixobj\r
+       del ..\*.msi\r
+\r
+FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll\r
+       candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
+\r
+FastCGI-x64.msm: FastCGI-x64.wixobj \r
+       light FastCGI-x64.wixobj\r
+       del ..\*.msi\r
+\r
+FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll\r
+       candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
+\r
+#\r
+# Log 4 shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)\r
+#\r
+Log4Shib-x64.msm: Log4Shib-x64.wixobj\r
+       light Log4Shib-x64.wixobj\r
+       del ..\*.msi\r
+\r
+Log4Shib-x86.msm: Log4Shib-x86.wixobj\r
+       light Log4Shib-x86.wixobj\r
+       del ..\*.msi\r
+\r
+Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Release\log4shib$(Log4ShibFileVersion).dll\r
+       candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\r
+\r
+Log4Shib-x64.wixobj: Log4Shib-x64.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\x64\Release\log4shib$(Log4ShibFileVersion).dll\r
+       candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d)\r
+\r
+#\r
+# OpenSAML\r
+#\r
+OpenSAML-x86.msm: OpenSAML-x86.wixobj\r
+       light OpenSAML-x86.wixobj\r
+       del ..\*.msi\r
+\r
+OpenSAML-x64.msm: OpenSAML-x64.wixobj\r
+       light OpenSAML-x64.wixobj\r
+       del ..\*.msi\r
+\r
+OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\Debug\saml$(OpenSAMLFileVersion)d.dll\r
+       candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32) -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32) -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d)\r
+\r
+OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\x64\Debug\saml$(OpenSAMLFileVersion)d.dll\r
+       candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64) -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64) -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d) -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d)\r
+\r
+OpenSAML-schemas.msm: OpenSAML-schemas.wixobj\r
+       light OpenSAML-schemas.wixobj\r
+\r
+OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs\r
+       candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) \r
+\r
+#\r
+# OpenSSL\r
+#\r
+OpenSSL-x86.msm: OpenSSL-x86.wixobj\r
+       light OpenSSL-x86.wixobj\r
+\r
+OpenSSL-x64.msm: OpenSSL-x64.wixobj\r
+       light OpenSSL-x64.wixobj\r
+\r
+OpenSSL-x86.wixobj: OpenSSL-x86.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\openssl.exe\r
+       candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)\r
+\r
+OpenSSL-x64.wixobj: OpenSSL-x64.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\openssl.exe\r
+       candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)\r
+\r
+#\r
+# Shibboleth DLL\r
+#\r
+Shibboleth-x86.msm: Shibboleth-x86.wixobj\r
+       light Shibboleth-x86.wixobj\r
+\r
+Shibboleth-x64.msm: Shibboleth-x64.wixobj\r
+       light Shibboleth-x64.wixobj\r
+\r
+Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll\r
+       candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd)\r
+\r
+Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll\r
+       candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component) -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd) -dShibDllLite64Componentd=$(ShibDllLite64Componentd)\r
+\r
+Shibboleth-schemas.msm: Shibboleth-schemas.wixobj\r
+       light Shibboleth-schemas.wixobj\r
+\r
+Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs\r
+       candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) \r
+\r
+\r
+#\r
+# Xerces\r
+#\r
+Xerces-x86.msm: Xerces-x86.wixobj\r
+       light Xerces-x86.wixobj\r
+\r
+Xerces-x64.msm: Xerces-x64.wixobj\r
+       light Xerces-x64.wixobj\r
+\r
+Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll\r
+       candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\r
+\r
+Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll\r
+       candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\r
+\r
+\r
+#\r
+# XmlSec\r
+#\r
+XmlSec-x86.msm: XmlSec-x86.wixobj\r
+       light XmlSec-x86.wixobj\r
+\r
+XmlSec-x64.msm: XmlSec-x64.wixobj\r
+       light XmlSec-x64.wixobj\r
+\r
+XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\txfmout.exe" \r
+       candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd)\r
+\r
+XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\txfmout.exe"\r
+       candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd)\r
+\r
+#\r
+# ZLIB\r
+#\r
+\r
+zlib-x86.msm: zlib-x86.wixobj\r
+       light zlib-x86.wixobj\r
+\r
+zlib-x64.msm: zlib-x64.wixobj\r
+       light zlib-x64.wixobj\r
+\r
+zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll\r
+       candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd)\r
+\r
+zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll\r
+       candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)\r
+\r
+#\r

diff --git a/msi/WiX/MergeModules/MergeModules.vcxproj b/msi/WiX/MergeModules/MergeModules.vcxproj
new file mode 100644 (file)
index 0000000..ed75f5a
--- /dev/null
+++ b/msi/WiX/MergeModules/MergeModules.vcxproj
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\MsBuild\Versions.props" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
+    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>del *86.wixobj\r
+del *86.msm\r
+del *x86.wixpdb\r
+del OpenSAML-schemas.wixpdb\r
+del OpenSAML-schemas.wixobj\r
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>del *64.wixobj\r
+del *64.msm \r
+del *64.wixpdb \r
+del OpenSAML-schemas.wixpdb \r
+del OpenSAML-schemas.wixobj\r
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="Curl-x64.wxs" />\r
+    <None Include="Curl-x86.wxs" />\r
+    <None Include="Curl.vcxproj.user" />\r
+    <None Include="FastCGI-x86.wxs" />\r
+    <None Include="FastCGI-x64.wxs" />\r
+    <None Include="MergeModules.make" />\r
+    <None Include="Log4Shib-x64.wxs" />\r
+    <None Include="Log4Shib-x86.wxs" />\r
+    <None Include="OpenSAML-schemas.wxs" />\r
+    <None Include="OpenSAML-x64.wxs" />\r
+    <None Include="OpenSAML-x86.wxs" />\r
+    <None Include="OpenSSL-x64.wxs" />\r
+    <None Include="OpenSSL-x86.wxs" />\r
+    <None Include="Shibboleth-schemas.wxs" />\r
+    <None Include="Shibboleth-x64.wxs" />\r
+    <None Include="Shibboleth-x86.wxs" />\r
+    <None Include="Xerces-x64.wxs" />\r
+    <None Include="Xerces-x86.wxs" />\r
+    <None Include="XmlSec-x64.wxs" />\r
+    <None Include="XmlSec-x86.wxs" />\r
+    <None Include="Zlib-x64.wxs" />\r
+    <None Include="Zlib-x86.wxs" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file