From: Rod Widdowson Date: Tue, 23 Oct 2012 12:04:51 +0000 (+0000) Subject: NMAKE file and .vcxproj file for the installers. X-Git-Tag: 2.5.1~37 X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c3526f2eef8aafb61c9deec5491124c40f605239;p=shibboleth%2Fcpp-sp.git NMAKE file and .vcxproj file for the installers. Delete the old wixproj files. Add wixcop to the merge modules make. --- diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make new file mode 100644 index 0000000..9091a2d --- /dev/null +++ b/msi/WiX/Installer.make @@ -0,0 +1,76 @@ +all: all32 all64 + +all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi + +all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi + +clean32: + del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib + +clean64: + del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib + +clean: clean32 clean64 + +rebuild32: clean32 all32 + +rebuild64: clean64 all64 + +# +# MSI +# +shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib + light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension + del shibboleth-sp-$(ShibbolethVersion)-win64.msi + +shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib + light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-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 + +# +# Individual files +# +ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\x64\Release\shibd.exe ..\..\x64\Release\resolvertest.exe ..\..\x64\Release\mdquery.exe ..\..\x64\Release\adfs.so ..\..\x64\Release\adfs-lite.so ..\..\x64\Release\isapi_shib.dll ..\..\x64\Release\mod_shib_22.so ..\..\x64\Release\mod_shib_24.so ..\..\x64\Release\odbc-store.so ..\..\x64\Release\plugins.so ..\..\x64\Release\plugins-lite.so ..\..\x64\Release\shibauthorizer.exe ..\..\x64\Release\shibresponder.exe ..\..\x64\Debug\shibd.exe ..\..\x64\Debug\resolvertest.exe ..\..\x64\Debug\mdquery.exe ..\..\x64\Debug\adfs.so ..\..\x64\Debug\adfs-lite.so ..\..\x64\Debug\isapi_shib.dll ..\..\x64\Debug\mod_shib_22.so ..\..\x64\Debug\mod_shib_24.so ..\..\x64\Debug\odbc-store.so ..\..\x64\Debug\plugins.so ..\..\x64\Debug\plugins-lite.so ..\..\x64\Debug\shibauthorizer.exe ..\..\x64\Debug\shibresponder.exe + wixcop -indent:2 ShibbolethSP-exe-x64.wxs + candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x64.wxs + +ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs + wixcop -indent:2 ShibbolethSP-registry-x64.wxs + candle ShibbolethSP-registry-x64.wxs + +ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs + wixcop -indent:2 ShibbolethSP-noarch.wxs + candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-noarch.wxs + +ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Release\shibd.exe ..\..\Release\resolvertest.exe ..\..\Release\mdquery.exe ..\..\Release\adfs.so ..\..\Release\adfs-lite.so ..\..\Release\isapi_shib.dll ..\..\Release\mod_shib_20.so ..\..\Release\mod_shib_22.so ..\..\Release\mod_shib_13.so ..\..\Release\mod_shib_24.so ..\..\Release\nsapi_shib.dll ..\..\Release\odbc-store.so ..\..\Release\plugins.so ..\..\Release\plugins-lite.so ..\..\Release\shibauthorizer.exe ..\..\Release\shibresponder.exe ..\..\Debug\shibd.exe ..\..\Debug\resolvertest.exe ..\..\Debug\mdquery.exe ..\..\Debug\adfs.so ..\..\Debug\adfs-lite.so ..\..\Debug\isapi_shib.dll ..\..\Debug\mod_shib_13.so ..\..\Debug\mod_shib_20.so ..\..\Debug\mod_shib_22.so ..\..\Debug\mod_shib_24.so ..\..\Debug\nsapi_shib.dll ..\..\Debug\odbc-store.so ..\..\Debug\plugins.so ..\..\Debug\plugins-lite.so ..\..\Debug\shibauthorizer.exe ..\..\Debug\shibresponder.exe + wixcop -indent:2 ShibbolethSP-exe-x86.wxs + candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x86.wxs + +ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs + wixcop -indent:2 ShibbolethSP-registry-x86.wxs + candle ShibbolethSP-registry-x86.wxs + +ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs + wixcop -indent:2 ShibbolethSP-gui.wxs + candle ShibbolethSP-gui.wxs + +ShibbolethSP-update-dlg.wixobj: 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 + +ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs 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 MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm +# wixcop -indent:2 ShibbolethSP-main-x64.wxs + candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs + +ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs 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) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x86.wxs diff --git a/msi/WiX/Installer.vcxproj b/msi/WiX/Installer.vcxproj new file mode 100644 index 0000000..ed01d3b --- /dev/null +++ b/msi/WiX/Installer.vcxproj @@ -0,0 +1,74 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C2B1BB79-C88B-42B4-9AEC-170F91910F70} + MakeFileProj + + + + Makefile + false + + + + + + + + + + + + + + + nmake /f Installer.make clean + del *.wixobj *.msi *.wixlib + nmake /f Installer.make clean + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + + + nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32 + del *86.wixobj +del *86.msi +del *.wixlib +del *x86.wixpdb + nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32 + + + + + nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64 + del *64.wixobj +del *64.msmi +del *.wixlib +del *64.wixpdb + nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64 + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + + + + + + + + + diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make index 7f4a866..87ce185 100644 --- a/msi/WiX/MergeModules/MergeModules.make +++ b/msi/WiX/MergeModules/MergeModules.make @@ -24,13 +24,15 @@ Curl-x64.msm: Curl-x64.wixobj del ..\*.msi 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 + wixcop -indent:2 Curl-x64.wxs candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) Curl-x86.msm: Curl-x86.wixobj light Curl-x86.wixobj del ..\*.msi -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 +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 + wixcop -indent:2 Curl-x86.wxs candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) # @@ -40,7 +42,8 @@ FastCGI-x86.msm: FastCGI-x86.wixobj light FastCGI-x86.wixobj del ..\*.msi -FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll +FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll + wixcop -indent:2 FastCGI-x86.wxs candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) FastCGI-x64.msm: FastCGI-x64.wixobj @@ -48,6 +51,7 @@ FastCGI-x64.msm: FastCGI-x64.wixobj del ..\*.msi FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll + wixcop -indent:2 FastCGI-x64.wxs candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) # @@ -62,9 +66,11 @@ Log4Shib-x86.msm: Log4Shib-x86.wixobj del ..\*.msi Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Release\log4shib$(Log4ShibFileVersion).dll + wixcop -indent:2 Log4Shib-x86.wxs candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d) 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 + wixcop -indent:2 Log4Shib-x64.wxs candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) # @@ -79,9 +85,11 @@ OpenSAML-x64.msm: OpenSAML-x64.wixobj del ..\*.msi 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 + 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) 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 + 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) OpenSAML-schemas.msm: OpenSAML-schemas.wixobj @@ -89,6 +97,7 @@ OpenSAML-schemas.msm: 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) # @@ -103,9 +112,11 @@ OpenSSL-x64.msm: OpenSSL-x64.wixobj del ..\*.msi 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 + 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) 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 + 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) # @@ -120,9 +131,11 @@ Shibboleth-x64.msm: Shibboleth-x64.wixobj del ..\*.msi 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 + wixcop -indent:2 Shibboleth-x86.wxs candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd) 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 + wixcop -indent:2 Shibboleth-x64.wxs candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component) -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd) -dShibDllLite64Componentd=$(ShibDllLite64Componentd) Shibboleth-schemas.msm: Shibboleth-schemas.wixobj @@ -130,6 +143,7 @@ Shibboleth-schemas.msm: Shibboleth-schemas.wixobj del ..\*.msi Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs + wixcop -indent:2 Shibboleth-schemas.wxs candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) @@ -145,9 +159,11 @@ Xerces-x64.msm: Xerces-x64.wixobj del ..\*.msi 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 + wixcop -indent:2 Xerces-x86.wxs candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) 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 + wixcop -indent:2 Xerces-x64.wxs candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) @@ -163,9 +179,11 @@ XmlSec-x64.msm: XmlSec-x64.wixobj del ..\*.msi 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" + wixcop -indent:2 XmlSec-x86.wxs candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) 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" + wixcop -indent:2 XmlSec-x64.wxs candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) # @@ -181,9 +199,11 @@ zlib-x64.msm: zlib-x64.wixobj del ..\*.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) 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) # diff --git a/msi/WiX/Shibboleth32/Shibboleth32.wixproj b/msi/WiX/Shibboleth32/Shibboleth32.wixproj deleted file mode 100644 index bf5c80f..0000000 --- a/msi/WiX/Shibboleth32/Shibboleth32.wixproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Debug - x86 - 3.5 - {cb336986-b518-4b6f-96a7-6ca17ada82df} - 2.0 - Shibboleth32 - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - ..\ - .\ - Debug;BuildRoot=$(CxxTestRoot) - -sw1055 -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension - True - ICE82 - - - - - - - ..\ - .\ - - - - ShibbolethSP-exe-x86.wxs - - - ShibbolethSP-gui.wxs - - - ShibbolethSP-install-dlg.wxs - - - ShibbolethSP-main-x86.wxs - - - ShibbolethSP-noarch.wxs - - - ShibbolethSP-registry-x86.wxs - - - ShibbolethSP-update-dlg.wxs - - - - - \ No newline at end of file diff --git a/msi/WiX/Shibboleth64/Shibboleth64.wixproj b/msi/WiX/Shibboleth64/Shibboleth64.wixproj deleted file mode 100644 index 257c71d..0000000 --- a/msi/WiX/Shibboleth64/Shibboleth64.wixproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - Debug - x64 - 3.5 - {d0ca844c-998e-4ab6-8274-059cee8c2fe8} - 2.0 - Shibboleth64 - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - ..\ - .\ - Debug - -sw1055 -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension - ICE82 - True - - - ..\ - .\ - - - - ShibbolethSP-exe-x64.wxs - - - ShibbolethSP-exe-x86.wxs - - - ShibbolethSP-gui.wxs - - - ShibbolethSP-install-dlg.wxs - - - ShibbolethSP-main-x64.wxs - - - ShibbolethSP-noarch.wxs - - - ShibbolethSP-registry-x64.wxs - - - ShibbolethSP-registry-x86.wxs - - - ShibbolethSP-update-dlg.wxs - - - - - \ No newline at end of file diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs index 3038d47..951566d 100644 --- a/msi/WiX/ShibbolethSP-main-x64.wxs +++ b/msi/WiX/ShibbolethSP-main-x64.wxs @@ -17,9 +17,10 @@ permissions and limitations under the License. --> + - + - - - + +