[shibboleth-sp2] 08/82: SSPCPP-689 Merge Module build: support for VC14 and OpenSSL 1.1
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit d2f2b7ed95f685bdf08c6c8fc9fa5b191eebfc3c
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Wed Dec 28 17:28:02 2016 +0000
SSPCPP-689 Merge Module build: support for VC14 and OpenSSL 1.1
https://issues.shibboleth.net/jira/browse/SSPCPP-689
Remove many hard wired (to VC10) paths and indirect
via $(var.ShibbolethMsVersion)
For cUrl and OpenSSL define the paths and dll names
as a function of the OpenSSL build version (not the
VC version which is irrelevant)
---
Projects/vc14/Wix/MergeModules.vcxproj | 16 +++++++++-------
msi/WiX/MergeModules/Curl-x64.wxs | 24 ++++++++++++++++++++----
msi/WiX/MergeModules/Curl-x86.wxs | 24 ++++++++++++++++++++----
msi/WiX/MergeModules/FastCGI-x64.wxs | 6 +++---
msi/WiX/MergeModules/FastCGI-x86.wxs | 6 +++---
msi/WiX/MergeModules/Log4Shib-x64.wxs | 4 ++--
msi/WiX/MergeModules/Log4Shib-x86.wxs | 4 ++--
msi/WiX/MergeModules/MergeModules.make | 24 ++++++++++++------------
msi/WiX/MergeModules/OpenSSL-x64.wxs | 32 ++++++++++++++++++++++++++------
msi/WiX/MergeModules/OpenSSL-x86.wxs | 34 ++++++++++++++++++++++++++++------
msi/WiX/MergeModules/Xerces-x64.wxs | 4 ++--
msi/WiX/MergeModules/Xerces-x86.wxs | 4 ++--
msi/WiX/MergeModules/XmlSec-x64.wxs | 4 ++--
msi/WiX/MergeModules/XmlSec-x86.wxs | 4 ++--
14 files changed, 133 insertions(+), 57 deletions(-)
diff --git a/Projects/vc14/Wix/MergeModules.vcxproj b/Projects/vc14/Wix/MergeModules.vcxproj
index a71f37f..d03aa1b 100644
--- a/Projects/vc14/Wix/MergeModules.vcxproj
+++ b/Projects/vc14/Wix/MergeModules.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -50,7 +50,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *86.wixobj
del *86.msm
@@ -59,14 +59,14 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>
cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *64.wixobj
del *64.msm
@@ -75,7 +75,7 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
@@ -97,7 +97,9 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastC
<None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-x86.wxs">
<SubType>Designer</SubType>
</None>
- <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x64.wxs" />
+ <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x64.wxs">
+ <SubType>Designer</SubType>
+ </None>
<None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x86.wxs" />
<None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-schemas.wxs" />
<None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-x64.wxs" />
@@ -112,4 +114,4 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastC
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 3fb8af4..e4a6230 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -16,6 +16,22 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
+<?if $(var.OpenSSLV1Libs) = "1" ?>
+
+<?define ReleaseDllDir="builds\libcurl-vc14-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseExeDir="builds\libcurl-vc14-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugDllDir="builds\libcurl-vc14-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugExeDir="builds\libcurl-vc14-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+
+<?else ?>
+
+<?define ReleaseDllDir="lib\release-dll-ssl-dll-zlib-dll.x64"?>
+<?define DebugDllDir="lib\debug-dll-ssl-dll-zlib-dll.x64"?>
+<?define ReleaseExeDir="src\release.x64"?>
+<?define DebugExeDir="src\debug"?>
+
+<?endif ?>
+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
<Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'
@@ -29,20 +45,20 @@
<Directory Id='lib' Name='lib'>
<Component Id='libcurl5.dll' Guid='{2A1FBA83-FA2B-4E89-8C58-F1753B878B57}' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl5.dll'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl5.dll'/>
</Component>
<Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe'/>
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='libcurl5d.dll' Guid='{0F38951E-CB25-417C-918D-54D62851EBC7}' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurl5d.dll'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl5d.dll'/>
</Component>
<Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
<File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe'/>
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 8ef2c0d..811a618 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -16,6 +16,22 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
+<?if $(var.OpenSSLV1Libs) = "1" ?>
+
+<?define ReleaseDllDir="builds\libcurl-vc14-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseExeDir="builds\libcurl-vc14-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugDllDir="builds\libcurl-vc14-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugExeDir="builds\libcurl-vc14-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+
+<?else ?>
+
+<?define ReleaseDllDir="lib\release-dll-ssl-dll-zlib-dll"?>
+<?define DebugDllDir="lib\debug-dll-ssl-dll-zlib-dll"?>
+<?define ReleaseExeDir="src\release"?>
+<?define DebugExeDir="src\debug"?>
+
+<?endif ?>
+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
<Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
@@ -29,20 +45,20 @@
<Directory Id='lib' Name='lib'>
<Component Id='libcurl5.dll' Guid='{2497836C-20B2-4218-A53A-CD9E091FB9AC}'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl5.dll'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl5.dll'/>
</Component>
<Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe'/>
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='libcurl5d.dll' Guid='{0F97DFC6-87F4-45DE-81A7-51D189603FCF}'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurl5d.dll'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl5d.dll'/>
</Component>
<Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
<File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugExeDir)\curl.exe'/>
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 25ba131..7e542bb 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -29,19 +29,19 @@
<Directory Id='lib' Name='lib'>
<Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Release\libfcgi.dll' />
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\x64\Debug\libfcgid.dll' />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
<Directory Id='doc' Name='doc'>
<Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>
<File KeyPath='yes' Name='FASTCGI.LICENSE'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\LICENSE.TERMS' />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index fbc1048..41456cd 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -29,19 +29,19 @@
<Directory Id='lib' Name='lib'>
<Component Id='libfcgi.dll' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Release\libfcgi.dll' />
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='libfcgid.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\Win32\Debug\libfcgid.dll' />
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
<Directory Id='doc' Name='doc'>
<Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
<File KeyPath='yes' Name='FASTCGI.LICENSE'
- Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-$(var.ShibbolethMsVersion)\LICENSE.TERMS' />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 920105d..909fe84 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -26,14 +26,14 @@
<Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_SP' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\x64\Release\'>
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\ms$(var.ShibbolethMsVersion)\x64\Release\'>
<Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent64)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion).dll'/>
</Component>
<Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\x64\Debug\'>
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\ms$(var.ShibbolethMsVersion)\x64\Debug\'>
<Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent64d)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion)D.dll'/>
</Component>
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 815bea2..4925c21 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -26,14 +26,14 @@
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_SP' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\Release\'>
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\ms$(var.ShibbolethMsVersion)\Release\'>
<Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>
<File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion).dll'/>
</Component>
<Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
<File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\Debug\'>
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\ms$(var.ShibbolethMsVersion)\Debug\'>
<Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>
<File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion)D.dll'/>
</Component>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 72b3a22..2796b18 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -25,7 +25,7 @@ Curl-x64.msm: Curl-x64.wixobj
Curl-x64.wixobj: Curl-x64.wxs
wixcop -indent:2 Curl-x64.wxs
- candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
+ candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
Curl-x86.msm: Curl-x86.wixobj
light Curl-x86.wixobj
@@ -33,7 +33,7 @@ Curl-x86.msm: Curl-x86.wixobj
Curl-x86.wixobj: Curl-x86.wxs
wixcop -indent:2 Curl-x86.wxs
- candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
+ candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
#
# FastCGI
@@ -44,7 +44,7 @@ FastCGI-x86.msm: FastCGI-x86.wixobj
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)
+ candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion)
FastCGI-x64.msm: FastCGI-x64.wixobj
light FastCGI-x64.wixobj
@@ -52,7 +52,7 @@ FastCGI-x64.msm: FastCGI-x64.wixobj
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)
+ 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)
@@ -67,11 +67,11 @@ Log4Shib-x86.msm: Log4Shib-x86.wixobj
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)
+ 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)
+ candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
#
# OpenSAML
@@ -113,11 +113,11 @@ OpenSSL-x64.msm: OpenSSL-x64.wixobj
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)
+ 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)
+ 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
@@ -159,11 +159,11 @@ Xerces-x64.msm: Xerces-x64.wixobj
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)
+ 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)
+ candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
#
@@ -179,11 +179,11 @@ XmlSec-x64.msm: XmlSec-x64.wixobj
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)
+ 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)
+ candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
#
# ZLIB
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 196bfed..129dfd5 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -16,6 +16,26 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
+<?if $(var.OpenSSLV1Libs) = "1" ?>
+
+<?define ReleaseDir="x64\bin"?>
+<?define DebugDir="x64Debug\bin"?>
+<?define LibEay="libcrypto-$(var.OpenSSLFileVersion)-x64.dll"?>
+<?define LibEayD="libcrypto-$(var.OpenSSLFileVersion)D-x64.dll"?>
+<?define SslEay="libssl-$(var.OpenSSLFileVersion)-x64.dll"?>
+<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D-x64.dll"?>
+
+<?else ?>
+
+<?define ReleaseDir="out64dll"?>
+<?define DebugDir="out64dll.dbg"?>
+<?define LibEay="libeay32_$(var.OpenSSLFileVersion).dll"?>
+<?define LibEayD="libeay32_$(var.OpenSSLFileVersion)D.dll"?>
+<?define SslEay="ssleay32_$(var.OpenSSLFileVersion).dll"?>
+<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion).dll"?>
+
+<?endif ?>
+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
<Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'
@@ -25,22 +45,22 @@
<Directory Id='ProgramFiles64Folder' >
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_sp' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.ReleaseDir)\' >
<Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.LibEay)' />
</Component>
<Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.SslEay)' />
</Component>
<Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.DebugDir)\'>
<Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.LibEayD)' />
</Component>
<Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.SslEayD)' />
</Component>
<Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
<File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 9f69f54..a4cde2b 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -16,6 +16,28 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
+<?if $(var.OpenSSLV1Libs) = "1" ?>
+
+<?define ReleaseDir="x86\bin"?>
+<?define DebugDir="x86Debug\bin"?>
+<?define LibEay="libcrypto-$(var.OpenSSLFileVersion).dll"?>
+<?define LibEayD="libcrypto-$(var.OpenSSLFileVersion)D.dll"?>
+<?define SslEay="libssl-$(var.OpenSSLFileVersion).dll"?>
+<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D.dll"?>
+
+<?else ?>
+
+<?define ReleaseDir="out64dll"?>
+<?define DebugDir="out64dll.dbg"?>
+<?define LibEay="libeay32_$(var.OpenSSLFileVersion).dll"?>
+<?define LibEayD="libeay32_$(var.OpenSSLFileVersion)D.dll"?>
+<?define SslEay="ssleay32_$(var.OpenSSLFileVersion).dll"?>
+<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion).dll"?>
+
+<?endif ?>
+
+
+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
<Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'
@@ -25,22 +47,22 @@
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_sp' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.ReleaseDir)\'>
<Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>
- <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.LibEay)' />
</Component>
<Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>
- <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.SslEay)' />
</Component>
<Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.DebugDir)\' >
<Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.LibEayD)' />
</Component>
<Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>
- <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+ <File KeyPath='yes' Checksum='yes' Name='$(var.SslEayD)' />
</Component>
<Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
<File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 0824d4b..6a6af3b 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\VC10\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\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\VC10\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\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 6c0672d..ee80178 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\VC10\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\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\VC10\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 3b092ea..abd9e93 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -26,7 +26,7 @@
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_SP' Name='SP'>
<Directory Id='lib' Name='lib'
- FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\$(var.ShibbolethMsVersion)\Release No Xalan'>
<Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
</Component>
@@ -49,7 +49,7 @@
<File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
</Component>
<Directory Id='lib_debug' Name='debug'
- FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\$(var.ShibbolethMsVersion)\Debug No Xalan'>
<Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
</Component>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index d499a3f..982c544 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -26,7 +26,7 @@
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_SP' Name='SP'>
<Directory Id='lib' Name='lib'
- FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Release No Xalan'>
<Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
</Component>
@@ -49,7 +49,7 @@
<File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
</Component>
<Directory Id='lib_debug' Name='debug'
- FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Debug No Xalan'>
<Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
</Component>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list