[cpp-msbuild] branch master updated: SSPCPP-870 Preserve OpenSSL PDB files during build

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=83d9a5d7a9aa7ecdae516bb1bae34e9b8a91e12a

The following commit(s) were added to refs/heads/master by this push:
       new  83d9a5d   SSPCPP-870 Preserve OpenSSL PDB files during build
83d9a5d is described below

commit 83d9a5d7a9aa7ecdae516bb1bae34e9b8a91e12a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Feb 18 13:59:31 2020 +0000

    SSPCPP-870 Preserve OpenSSL PDB files during build
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-870
---
 dependencies/dependency.make | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index a323f2b..c6e2fda 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -13,12 +13,14 @@ MsBuildArch=Win32
 XsecBuildArch=Win32
 CMakeArch=Visual Studio 15 2017
 XercesBuildDir=Buildx86
+OpenSSLNameGarnish=
 XercesInstallDir=Install32\VC15
 !elseif "$(VSCMD_ARG_TGT_ARCH)" == "x64"
 !message Building x64
 OpenSSLName=WIN64A
 ZlibTargetDir=x64
 CMakeArch=Visual Studio 15 2017 Win64
+OpenSSLNameGarnish=-x64
 MsBuildArch=x64
 XsecBuildArch=Win64
 XercesBuildDir=Buildx64
@@ -150,9 +152,16 @@ $(ROOT_DIR)\$(ZLIB_DIR)\$(ZlibTargetDir)\debug\$(ZLIB_SHAREDLIB)D.dll: $(ROOT_DI
 #
 openssl: openssl-debug openssl-release
 
-openssl-release: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h
+openssl-release: openssl-test \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libssl-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libcrypto-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv
 
-openssl-debug: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h
+
+openssl-debug: openssl-test \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libssl-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv \
+	$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libcrypto-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv
 
 openssl-test: test-env $(ROOT_DIR)\$(OPENSSL_DIR)
 
@@ -175,9 +184,33 @@ openssl-clean-configure: openssl-test
 $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h:
 	nmake /f dependency.make openssl-clean-configure openssl-release-configure openssl-build
 
+$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libssl-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv: \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libssl-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb
+	copy /y $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libssl-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb \
+                $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libssl-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv
+
+$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libcrypto-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv: \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libcrypto-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb
+	copy /y $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libcrypto-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb \
+                $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\bin\libcrypto-$(OPENSSL_FILE_VERSION)$(OpenSSLNameGarnish).pdb-sv
+
 $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h: 
 	nmake /f dependency.make openssl-clean-configure openssl-debug-configure openssl-build
 
+$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libssl-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv: \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libssl-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb
+	copy /y $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libssl-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb \
+                $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libssl-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv
+
+$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libcrypto-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv: \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h \
+		$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libcrypto-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb
+	copy /y $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libcrypto-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb \
+                $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\bin\libcrypto-$(OPENSSL_FILE_VERSION)D$(OpenSSLNameGarnish).pdb-sv
+
 openssl-release-configure: openssl-test
 	title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)

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