[cpp-sp] branch master updated: Rename OpenSSL PDB files.

Scott Cantor cantor.2 at osu.edu
Mon Mar 23 15:08:15 EDT 2020


This is an automated email from the git hooks/post-receive script.

scantor 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=15c2a8effd33869a1a7546198dc5ab7bb3475475

The following commit(s) were added to refs/heads/master by this push:
       new  15c2a8e   Rename OpenSSL PDB files.
15c2a8e is described below

commit 15c2a8effd33869a1a7546198dc5ab7bb3475475
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 23 15:08:06 2020 -0400

    Rename OpenSSL PDB files.
---
 msi/WiX/MergeModules/OpenSSL-x64.wxs | 8 ++++----
 msi/WiX/MergeModules/OpenSSL-x86.wxs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index d3d6cc3..b2ae908 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -28,10 +28,10 @@
 <?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"?>
+<?define LibEayPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion)-x64.pdb"?>
+<?define LibEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D-x64.pdb"?>
+<?define SslEayPdbSrc = "$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion)-x64.pdb"?>
+<?define SslEayDPdbSrc="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D-x64.pdb"?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Module Id="OpenSSLMergeModule_x64" Language="1033" Version="$(var.OpenSSLVersion)">
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 9969ae4..cf0f6bc 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -28,10 +28,10 @@
 <?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"?>
+<?define LibEayPdbSrc  ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libcrypto-$(var.OpenSSLFileVersion).pdb"?>
+<?define SslEayPdbSrc  ="$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\libssl-$(var.OpenSSLFileVersion).pdb"?>
+<?define LibEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libcrypto-$(var.OpenSSLFileVersion)D.pdb"?>
+<?define SslEayDPdbSrc ="$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\libssl-$(var.OpenSSLFileVersion)D.pdb"?>
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list