Delete the old wixproj files.
Add wixcop to the merge modules make.
--- /dev/null
+all: all32 all64\r
+\r
+all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi\r
+\r
+all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi\r
+\r
+clean32: \r
+ del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib\r
+\r
+clean64: \r
+ del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib\r
+\r
+clean: clean32 clean64\r
+\r
+rebuild32: clean32 all32\r
+\r
+rebuild64: clean64 all64\r
+\r
+#\r
+# MSI\r
+#\r
+shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib\r
+ light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension\r
+ del shibboleth-sp-$(ShibbolethVersion)-win64.msi\r
+\r
+shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib\r
+ 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\r
+\r
+#\r
+# Library\r
+#\r
+Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj\r
+ 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\r
+\r
+#\r
+# Individual files\r
+#\r
+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\r
+ wixcop -indent:2 ShibbolethSP-exe-x64.wxs\r
+ candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x64.wxs\r
+\r
+ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs\r
+ wixcop -indent:2 ShibbolethSP-registry-x64.wxs\r
+ candle ShibbolethSP-registry-x64.wxs\r
+\r
+ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs\r
+ wixcop -indent:2 ShibbolethSP-noarch.wxs\r
+ candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-noarch.wxs\r
+\r
+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\r
+ wixcop -indent:2 ShibbolethSP-exe-x86.wxs\r
+ candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x86.wxs\r
+\r
+ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs\r
+ wixcop -indent:2 ShibbolethSP-registry-x86.wxs\r
+ candle ShibbolethSP-registry-x86.wxs\r
+\r
+ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs\r
+ wixcop -indent:2 ShibbolethSP-gui.wxs\r
+ candle ShibbolethSP-gui.wxs\r
+\r
+ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs\r
+ wixcop -indent:2 ShibbolethSP-update-dlg.wxs\r
+ candle ShibbolethSP-update-dlg.wxs\r
+\r
+ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs\r
+ wixcop -indent:2 ShibbolethSP-install-dlg.wxs\r
+ candle ShibbolethSP-install-dlg.wxs\r
+\r
+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\r
+# wixcop -indent:2 ShibbolethSP-main-x64.wxs\r
+ candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs\r
+\r
+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\r
+# wixcop -indent:2 ShibbolethSP-main-x86.wxs\r
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x86.wxs\r
--- /dev/null
+<?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>{C2B1BB79-C88B-42B4-9AEC-170F91910F70}</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 Installer.make clean</NMakeBuildCommandLine>\r
+ <NMakeCleanCommandLine>del *.wixobj *.msi *.wixlib</NMakeCleanCommandLine>\r
+ <NMakeReBuildCommandLine>nmake /f Installer.make clean</NMakeReBuildCommandLine>\r
+ <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+ <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
+ <NMakeCleanCommandLine>del *86.wixobj\r
+del *86.msi\r
+del *.wixlib\r
+del *x86.wixpdb</NMakeCleanCommandLine>\r
+ <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
+ <NMakePreprocessorDefinitions>\r
+ </NMakePreprocessorDefinitions>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+ <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
+ <NMakeCleanCommandLine>del *64.wixobj\r
+del *64.msmi\r
+del *.wixlib\r
+del *64.wixpdb</NMakeCleanCommandLine>\r
+ <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
+ <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+ </PropertyGroup>\r
+ <ItemDefinitionGroup>\r
+ </ItemDefinitionGroup>\r
+ <ItemGroup>\r
+ </ItemGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+ <ImportGroup Label="ExtensionTargets">\r
+ </ImportGroup>\r
+</Project>\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
+ wixcop -indent:2 Curl-x64.wxs \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
+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
+ wixcop -indent:2 Curl-x86.wxs \r
candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\r
\r
#\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
+FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll \r
+ wixcop -indent:2 FastCGI-x86.wxs \r
candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
\r
FastCGI-x64.msm: 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
+ wixcop -indent:2 FastCGI-x64.wxs \r
candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
\r
#\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
+ wixcop -indent:2 Log4Shib-x86.wxs \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
+ wixcop -indent:2 Log4Shib-x64.wxs \r
candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d)\r
\r
#\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
+ wixcop -indent:2 OpenSAML-x86.wxs \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
+ wixcop -indent:2 OpenSAML-x64.wxs \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
del ..\*.msi\r
\r
OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs\r
+ wixcop -indent:2 OpenSAML-schemas.wxs \r
candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) \r
\r
#\r
del ..\*.msi\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
+ wixcop -indent:2 OpenSSL-x86.wxs \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
+ wixcop -indent:2 OpenSSL-x64.wxs \r
candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)\r
\r
#\r
del ..\*.msi\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
+ wixcop -indent:2 Shibboleth-x86.wxs \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
+ wixcop -indent:2 Shibboleth-x64.wxs \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
del ..\*.msi\r
\r
Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs\r
+ wixcop -indent:2 Shibboleth-schemas.wxs \r
candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) \r
\r
\r
del ..\*.msi\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
+ wixcop -indent:2 Xerces-x86.wxs \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
+ wixcop -indent:2 Xerces-x64.wxs \r
candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\r
\r
\r
del ..\*.msi\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
+ wixcop -indent:2 XmlSec-x86.wxs \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
+ wixcop -indent:2 XmlSec-x64.wxs \r
candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd)\r
\r
#\r
del ..\*.msi\r
\r
zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll\r
+ wixcop -indent:2 zlib-x86.wxs \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
+ wixcop -indent:2 zlib-x64.wxs \r
candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)\r
\r
#\r
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
- <Import Project="..\props.props" />\r
- <PropertyGroup>\r
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
- <InstallerPlatform>x86</InstallerPlatform>\r
- <ProductVersion>3.5</ProductVersion>\r
- <ProjectGuid>{cb336986-b518-4b6f-96a7-6ca17ada82df}</ProjectGuid>\r
- <SchemaVersion>2.0</SchemaVersion>\r
- <OutputName>Shibboleth32</OutputName>\r
- <OutputType>Package</OutputType>\r
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
- </PropertyGroup>\r
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">\r
- <OutputPath>..\</OutputPath>\r
- <IntermediateOutputPath>.\</IntermediateOutputPath>\r
- <DefineConstants>Debug;BuildRoot=$(CxxTestRoot)</DefineConstants>\r
- <LinkerAdditionalOptions>-sw1055 -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension</LinkerAdditionalOptions>\r
- <SuppressPdbOutput>True</SuppressPdbOutput>\r
- <SuppressIces>ICE82</SuppressIces>\r
- <WixVariables>\r
- </WixVariables>\r
- <CompilerAdditionalOptions>\r
- </CompilerAdditionalOptions>\r
- </PropertyGroup>\r
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">\r
- <OutputPath>..\</OutputPath>\r
- <IntermediateOutputPath>.\</IntermediateOutputPath>\r
- </PropertyGroup>\r
- <ItemGroup>\r
- <Compile Include="..\ShibbolethSP-exe-x86.wxs">\r
- <Link>ShibbolethSP-exe-x86.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-gui.wxs">\r
- <Link>ShibbolethSP-gui.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-install-dlg.wxs">\r
- <Link>ShibbolethSP-install-dlg.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-main-x86.wxs">\r
- <Link>ShibbolethSP-main-x86.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-noarch.wxs">\r
- <Link>ShibbolethSP-noarch.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-registry-x86.wxs">\r
- <Link>ShibbolethSP-registry-x86.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-update-dlg.wxs">\r
- <Link>ShibbolethSP-update-dlg.wxs</Link>\r
- </Compile>\r
- </ItemGroup>\r
- <Import Project="$(WixTargetsPath)" />\r
- <!--\r
- To modify your build process, add your task inside one of the targets below and uncomment it.\r
- Other similar extension points exist, see Wix.targets.\r
- <Target Name="BeforeBuild">\r
- </Target>\r
- <Target Name="AfterBuild">\r
- </Target>\r
- -->\r
-</Project>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
- <PropertyGroup>\r
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
- <InstallerPlatform>x64</InstallerPlatform>\r
- <ProductVersion>3.5</ProductVersion>\r
- <ProjectGuid>{d0ca844c-998e-4ab6-8274-059cee8c2fe8}</ProjectGuid>\r
- <SchemaVersion>2.0</SchemaVersion>\r
- <OutputName>Shibboleth64</OutputName>\r
- <OutputType>Package</OutputType>\r
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
- </PropertyGroup>\r
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">\r
- <OutputPath>..\</OutputPath>\r
- <IntermediateOutputPath>.\</IntermediateOutputPath>\r
- <DefineConstants>Debug</DefineConstants>\r
- <LinkerAdditionalOptions>-sw1055 -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension</LinkerAdditionalOptions>\r
- <SuppressIces>ICE82</SuppressIces>\r
- <SuppressPdbOutput>True</SuppressPdbOutput>\r
- </PropertyGroup>\r
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">\r
- <OutputPath>..\</OutputPath>\r
- <IntermediateOutputPath>.\</IntermediateOutputPath>\r
- </PropertyGroup>\r
- <ItemGroup>\r
- <Compile Include="..\ShibbolethSP-exe-x64.wxs">\r
- <Link>ShibbolethSP-exe-x64.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-exe-x86.wxs">\r
- <Link>ShibbolethSP-exe-x86.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-gui.wxs">\r
- <Link>ShibbolethSP-gui.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-install-dlg.wxs">\r
- <Link>ShibbolethSP-install-dlg.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-main-x64.wxs">\r
- <Link>ShibbolethSP-main-x64.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-noarch.wxs">\r
- <Link>ShibbolethSP-noarch.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-registry-x64.wxs">\r
- <Link>ShibbolethSP-registry-x64.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-registry-x86.wxs">\r
- <Link>ShibbolethSP-registry-x86.wxs</Link>\r
- </Compile>\r
- <Compile Include="..\ShibbolethSP-update-dlg.wxs">\r
- <Link>ShibbolethSP-update-dlg.wxs</Link>\r
- </Compile>\r
- </ItemGroup>\r
- <Import Project="$(WixTargetsPath)" />\r
- <!--\r
- To modify your build process, add your task inside one of the targets below and uncomment it.\r
- Other similar extension points exist, see Wix.targets.\r
- <Target Name="BeforeBuild">\r
- </Target>\r
- <Target Name="AfterBuild">\r
- </Target>\r
- -->\r
-</Project>
\ No newline at end of file
permissions and limitations under the License. -->
<?include Versions.wxi ?>
+<?define ShibbolethId64='{65F34F66-573F-432D-A6F4-B5E1D417A6DA}' ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Id='{65F34F66-573F-432D-A6F4-B5E1D417A6DA}' Language='1033'
+ <Product Id='$(var.ShibbolethId64)' Language='1033'
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider'
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
<Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion)' Compressed='yes'
permissions and limitations under the License. -->
<?include Versions.wxi ?>
+<?define ShibbolethId32='{68D3C057-1C6D-4C3C-9E5B-7A6A8CA0BA74}' ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Id='{68D3C057-1C6D-4C3C-9E5B-7A6A8CA0BA74}' Language='1033'
+ <Product Id='$(var.ShibbolethId32)' Language='1033'
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider'
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
<Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion)' Compressed='yes'
permissions and limitations under the License. -->
<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <?define BuildDirectory='C:\Users\Administrator\Shibboleth\' ?>
- <?define SPBuildDirectory='C:\Users\Administrator\Shibboleth\svn\2.5\' ?>
+ <?define BuildDirectory='C:\perforce\ShibbolethBuild\' ?>
+ <?define SPBuildDirectory='C:\Users\rdw\ShibbolethSp\' ?>
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
<?define ShibbolethVersion='2.5.1'?>
projects / shibboleth / cpp-sp.git / commitdiff