--- /dev/null
+#\r
+# Short cuts to make things easier\r
+\r
+SPROOT=$(MAKEDIR)\..\..\cpp-sp\r
+XMLROOT=$(MAKEDIR)\..\..\cpp-xmltooling\r
+SAMLROOT=$(MAKEDIR)\..\..\cpp-OpenSaml\r
+\r
+\r
+#\r
+# The targets. We want to build the two installers\r
+#\r
+all: clean msi32 msi64\r
+\r
+clean: \r
+ cd ..\..\r
+ del/s *.dll\r
+ del/s *.exe\r
+ del/s *.msm\r
+ del/s *.lib\r
+ del/s *.wixlib\r
+ del/s *.msi\r
+\r
+veryclean: clean\r
+ cd ..\..\r
+ del/s *.obj *.wixobj\r
+ del/s *.lib *.wixlib\r
+ del/s *.pdb *.wixpdb\r
+\r
+#\r
+msi32: mergemodules32 exe32 \r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer\r
+\r
+msi64: mergemodules32 exe32 mergemodules64 exe64\r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer\r
+\r
+mergemodules32: shibsp32 saml32 xmltooling32\r
+\r
+mergemodules64: shibsp64 saml64 xmltooling64\r
+\r
+shibsp32:\r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite\r
+ msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite\r
+\r
+shibsp64:\r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite\r
+ msbuild /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite\r
+\r
+saml32:\r
+ cd $(SAMLROOT)\r
+ msbuild /property:Platform=Win32;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign\r
+ msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign\r
+\r
+\r
+saml64:\r
+ cd $(SAMLROOT)\r
+ msbuild /property:Platform=x64;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign\r
+ msbuild /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign\r
+\r
+xmltooling32:\r
+ cd $(XMLROOT)\r
+ msbuild /property:Platform=Win32;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite\r
+ msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite\r
+\r
+xmltooling64:\r
+ cd $(XMLROOT)\r
+ msbuild /property:Platform=x64;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite\r
+ msbuild /property:Platform=x64;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite\r
+\r
+exe32:\r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24";"Server Modules\nsapi_shib"\r
+ msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24";"Server Modules\nsapi_shib"\r
+\r
+exe64:\r
+ cd $(SPROOT)\r
+ msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"\r
+ msbuild /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"\r