[cpp-sp] branch master updated: SSPCPP-870 Add OpenSSL to the installer
Rod Widdowson
rdw at steadingsoftware.com
Tue Feb 18 10:16:56 EST 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=620035d75bc36dbf2c2c1e728df123482938c095
The following commit(s) were added to refs/heads/master by this push:
new 620035d SSPCPP-870 Add OpenSSL to the installer
620035d is described below
commit 620035d75bc36dbf2c2c1e728df123482938c095
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Feb 18 15:14:51 2020 +0000
SSPCPP-870 Add OpenSSL to the installer
https://issues.shibboleth.net/jira/browse/SSPCPP-870
---
msi/WiX/MergeModules/OpenSSL-x64.wxs | 15 +++++++++------
msi/WiX/MergeModules/OpenSSL-x86.wxs | 13 +++++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index c60a5c1..d3d6cc3 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -28,6 +28,11 @@
<?define SslEayPdb="libssl-$(var.OpenSSLFileVersion)-x64.pdb"?>
<?define SslEayDPdb="libssl-$(var.OpenSSLFileVersion)D-x64.pdb"?>
+<?define LibEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion)-x64.pdb-sv"?>
+<?define LibEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D-x64.pdb-sv"?>
+<?define SslEayPdbSrc = "$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion)-x64.pdb-sv"?>
+<?define SslEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D-x64.pdb-sv"?>
+
<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)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
@@ -38,29 +43,27 @@
<Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\">
<Component Id="libeay32.dll" Guid="$(var.LibEay64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEay)" />
- <!--<File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" /> -->
+ <File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" Source="$(var.LibEayPdbSrc)" />
</Component>
<Component Id="ssleay32.dll" Guid="$(var.SSlEay64Component)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
- <!--<File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" /> -->
+ <File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" Source="$(var.SslEayPdbSrc)" />
</Component>
<Component Id="openssl.exe" Guid="{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
- <!-- <File KeyPath="no" Checksum="no" Name="openssl.pdb" /> -->
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
<Component Id="libeay32D.dll" Guid="$(var.LibEay64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
- <!-- <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" /> -->
+ <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" Source="$(var.LibEayDPdbSrc)" />
</Component>
<Component Id="ssleay32D.dll" Guid="$(var.SSlEay64Componentd)" Win64="yes">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
- <!-- <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" /> -->
+ <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" Source="$(var.SslEayDPdbSrc)" />
</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" />
- <!-- <File Id="openssl.pdb_debug" KeyPath="no" Checksum="no" Name="openssl.pdb" /> -->
</Component>
</Directory><!-- lib_debug-->
<?endif ?>
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index b718d91..9969ae4 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -23,6 +23,15 @@
<?define SslEay="libssl-$(var.OpenSSLFileVersion).dll"?>
<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D.dll"?>
+<?define LibEayPdb ="libcrypto-$(var.OpenSSLFileVersion).pdb"?>
+<?define LibEayDPdb ="libcrypto-$(var.OpenSSLFileVersion)D.pdb"?>
+<?define SslEayPdb ="libssl-$(var.OpenSSLFileVersion).pdb"?>
+<?define SslEayDPdb ="libssl-$(var.OpenSSLFileVersion)D.pdb"?>
+
+<?define LibEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion).pdb-sv"?>
+<?define SslEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion).pdb-sv"?>
+<?define LibEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D.pdb-sv"?>
+<?define SslEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D.pdb-sv"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
@@ -35,9 +44,11 @@
<Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\">
<Component Id="libeay32.dll" Guid="$(var.LibEay32Component)">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEay)" />
+ <File KeyPath="no" Checksum="no" Name="$(var.LibEayPdb)" Source="$(var.LibEayPdbSrc)" />
</Component>
<Component Id="ssleay32.dll" Guid="$(var.SSlEay32Component)">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEay)" />
+ <File KeyPath="no" Checksum="no" Name="$(var.SslEayPdb)" Source="$(var.SslEayPdbSrc)" />
</Component>
<Component Id="openssl.exe" Guid="{886F0254-AD10-45C6-A723-37C7FA466651}">
<File KeyPath="yes" Checksum="yes" Name="openssl.exe" />
@@ -46,9 +57,11 @@
<Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\">
<Component Id="libeay32D.dll" Guid="$(var.LibEay32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="$(var.LibEayD)" />
+ <File KeyPath="no" Checksum="no" Name="$(var.LibEayDPdb)" Source="$(var.LibEayDPdbSrc)" />
</Component>
<Component Id="ssleay32D.dll" Guid="$(var.SSlEay32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="$(var.SslEayD)" />
+ <File KeyPath="no" Checksum="no" Name="$(var.SslEayDPdb)" Source="$(var.SslEayDPdbSrc)" />
</Component>
<Component Id="openssl.exe_debug" Guid="{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}">
<File Id="openssl.exe_debug" KeyPath="yes" Checksum="yes" Name="openssl.exe" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list