[cpp-msbuild] branch master updated: SSPCPP-758 Uniquify OpenSSL and Curl DLLs
Rod Widdowson
rdw at steadingsoftware.com
Fri Jan 19 08:02:41 EST 2018
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=2bad730f6f452e8d00891730f1e619be0e720a94
The following commit(s) were added to refs/heads/master by this push:
new 2bad730 SSPCPP-758 Uniquify OpenSSL and Curl DLLs
2bad730 is described below
commit 2bad730f6f452e8d00891730f1e619be0e720a94
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 19 12:36:23 2018 +0000
SSPCPP-758 Uniquify OpenSSL and Curl DLLs
https://issues.shibboleth.net/jira/browse/SSPCPP-758
Add the subversion (3rd digit) uniqifier to the OpenSSL Dll names
so as to avoid clashing with other OpenSSL distros.
Add the minor version (second digit) uniqifier to the Curl Dll names
to protect against version creep.
Also tighten up the version change/GUID change thing such that
changing one the File Version (in config.bat) without modifying
the apporpiate GUID section (in Versions.props) will cause a
more obvious error messgae during the build.
---
Includes.props | 4 ++--
Versions.props | 57 ++++++++++++++++++++++++++++++++------------
dependencies/config.bat | 3 ++-
dependencies/dependency.make | 8 +++----
4 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/Includes.props b/Includes.props
index e514bfe..b9a8043 100644
--- a/Includes.props
+++ b/Includes.props
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Wibble">
- <LibCurlLib>libcurl5.lib</LibCurlLib>
- <LibCurlLibD>libcurl5d.lib</LibCurlLibD>
+ <LibCurlLib>libcurl$(LIBCURL_FILE_VERSION).lib</LibCurlLib>
+ <LibCurlLibD>libcurl$(LIBCURL_FILE_VERSION)d.lib</LibCurlLibD>
<SSLLib>libcrypto.lib;libssl.lib</SSLLib>
<SSLLibD>libcrypto.lib;libssl.lib</SSLLibD>
diff --git a/Versions.props b/Versions.props
index 0c989b2..1ae7adc 100644
--- a/Versions.props
+++ b/Versions.props
@@ -36,11 +36,6 @@
<!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
<ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
- <CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
- <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.57.0</CurlVersion>
- <curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
- <curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
-
<boost>boost_1_66_0</boost>
<OpenSAMLVersion>3.0.0</OpenSAMLVersion>
@@ -82,6 +77,22 @@
</PropertyGroup>
+ <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7_57'">
+ <CurlFileVersion>BAD_LIBCURL_FILE_VERSION</CurlFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '7_57'">
+ <CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
+ <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.57.0</CurlVersion>
+ <curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
+ <curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
+
+ <CurlFileVersion>$(LIBCURL_FILE_VERSION)</CurlFileVersion>
+ <LibCurlGuid32>{3E44FDF9-7367-49A4-926E-EF8A204B19A4}</LibCurlGuid32>
+ <LibCurlGuid64>{9C2D8BAF-DD21-4EC8-A243-C6B6137D158A}</LibCurlGuid64>
+ <LibCurlGuid32d>{59EFE4A8-E29C-4712-874D-70E3564F28C0}</LibCurlGuid32d>
+ <LibCurlGuid64d>{05FD66BA-25DD-4FD9-991F-FD7B18409637}</LibCurlGuid64d>
+ </PropertyGroup>
+
<PropertyGroup Label="Apache">
<Apache13Root Condition="'$(Apache13Root)'==''">$(APACHE_13_ROOT)</Apache13Root>
<Apache20Root Condition="'$(Apache20Root)'==''">$(APACHE_20_ROOT)</Apache20Root>
@@ -99,17 +110,20 @@
<openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
</PropertyGroup>
- <PropertyGroup Label="OpenSSLGuids " Condition="'$(OPENSSL_FILE_VERSION)' == '1_1'">
+ <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_0'">
+ <OpenSSLFileVersion>BAD_OPENSSL_FILE_VERSION</OpenSSLFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '1_1_0'">
<OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
<!-- Change the 8 components below iff OpenSSLFileVersion changes -->
- <LibEay32Component>{1E2D9B00-84CD-4fc4-9CE4-BEBE390AE692}</LibEay32Component>
- <SSlEay32Component>{94DE34A7-B404-494a-AAF1-EF5D4A8A448F}</SSlEay32Component>
- <LibEay32Componentd>{21E6CA27-1B37-4c7d-AEB1-68A45702B56E}</LibEay32Componentd>
- <SSlEay32Componentd>{F5EB9E01-BE1E-4d68-97F5-504A0673F896}</SSlEay32Componentd>
- <LibEay64Component>{E0522445-DA09-43dc-BEEF-46823B19BB48}</LibEay64Component>
- <SSlEay64Component>{2676AE3A-941F-4eff-AEFD-9649AD70C919}</SSlEay64Component>
- <LibEay64Componentd>{00A10097-8FF3-44f8-AFEC-2399A0958CD9}</LibEay64Componentd>
- <SSlEay64Componentd>{2512F0D0-CD50-4071-BECD-530EA83A4CCA}</SSlEay64Componentd>
+ <LibEay32Component>{2F270B9B-A68A-42EC-B817-068FEFD4F36D}</LibEay32Component>
+ <SSlEay32Component>{9BF58918-75A5-4F6C-A69A-F298EE502756}</SSlEay32Component>
+ <LibEay32Componentd>{BEC421FA-33EE-4BAE-8913-61ED6CCAB5E0}</LibEay32Componentd>
+ <SSlEay32Componentd>{AF64EEAC-398D-46B5-ACC1-2AF6EC5AD043}</SSlEay32Componentd>
+ <LibEay64Component>{EC689DCE-C907-4138-B0BB-0A85312ADC18}</LibEay64Component>
+ <SSlEay64Component>{88C83F53-D6F2-4C1D-B445-FC1F431864B8}</SSlEay64Component>
+ <LibEay64Componentd>{9440BD3A-941A-4B24-A5D6-742B79681362}</LibEay64Componentd>
+ <SSlEay64Componentd>{ED3D1584-77E9-4A37-95B5-D83881A1BF44}</SSlEay64Componentd>
</PropertyGroup>
<PropertyGroup Label="XSecGeneral">
@@ -121,7 +135,11 @@
<xmlsec Condition="'$(XSEC_DIR)'!=''">$(XSEC_DIR)</xmlsec>
</PropertyGroup>
- <PropertyGroup Label="XSecGuids " Condition="'$(XSEC_FILE_VERSION)' == '2_0'">
+ <PropertyGroup Label="XSecGuidsBad" Condition="'$(XSEC_FILE_VERSION)' != '2_0'">
+ <XmlSecFileVersion>BAD_XSEC_FILE_VERSION</XmlSecFileVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Label="XSecGuids" Condition="'$(XSEC_FILE_VERSION)' == '2_0'">
<XmlSecFileVersion>$(XSEC_FILE_VERSION)</XmlSecFileVersion>
<!-- Change the 4 components below iff XmlSecFileVersion changes -->
@@ -140,6 +158,9 @@
<zlib Condition="'$(ZLIB_DIR)'!=''">$(ZLIB_DIR)</zlib>
</PropertyGroup>
+ <PropertyGroup Label="ZLibGuidsBad" Condition="'$(ZLIB_FILE_VERSION)' != '1_2_11'">
+ <ZlibFileVersion>BAD_ZLIB_FILE_VERSION</ZlibFileVersion>
+ </PropertyGroup>
<PropertyGroup Label="ZLibGuids " Condition="'$(ZLIB_FILE_VERSION)' == '1_2_11'">
<ZlibFileVersion>$(ZLIB_FILE_VERSION)</ZlibFileVersion>
<!-- Change the 4 components below iff ZlibFileVersion changes -->
@@ -158,6 +179,9 @@
<xerces Condition="'$(XERCES_DIR)'!=''">$(XERCES_DIR)</xerces>
</PropertyGroup>
+ <PropertyGroup Label="XercesGuidsBad" Condition="'$(XERCES_FILE_VERSION)' != '3_2'">
+ <XercesFileVersion>BAD_XERCES_FILE_VERSION</XercesFileVersion>
+ </PropertyGroup>
<PropertyGroup Label="XercesGuids " Condition="'$(XERCES_FILE_VERSION)' == '3_2'">
<XercesFileVersion>$(XERCES_FILE_VERSION)</XercesFileVersion>
<!-- Change the 4 components below iff XercesFileVersion changes -->
@@ -174,6 +198,9 @@
<Log4ShibVersion Condition="'$(LOG4SHIB_MM_VERSION)' != ''">$(LOG4SHIB_MM_VERSION)</Log4ShibVersion>
</PropertyGroup>
+ <PropertyGroup Label="Log4ShibGuidsBad" Condition="'$(LOG4SHIB_FILE_VERSION)' != '1_0'">
+ <Log4ShibFileVersion>BAD_LOG4SHIB_FILE_VERSION</Log4ShibFileVersion>
+ </PropertyGroup>
<PropertyGroup Label="Log4ShibGuids" Condition="'$(LOG4SHIB_FILE_VERSION)' == '1_0'">
<Log4ShibFileVersion>$(LOG4SHIB_FILE_VERSION)</Log4ShibFileVersion>
<!-- Change the 4 components below if the Log4ShibFileVersion name changes -->
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 9b8ece3..5f1d35b 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -67,7 +67,7 @@ goto path_done
## if it changes you *MUST* change Version.props
set OPENSSL_DIR=openssl-1.1.0g
set OPENSSL_MM_VERSION=1.1.0.7
-set OPENSSL_FILE_VERSION=1_1
+set OPENSSL_FILE_VERSION=1_1_0
##
## CURL CONFIG
@@ -77,6 +77,7 @@ set OPENSSL_FILE_VERSION=1_1
##
Set LIBCURL_VERSION=7.57.0
set LIBCURL_DIR=curl-%LIBCURL_VERSION%
+set LIBCURL_FILE_VERSION=7_57
##
## XML SECURITY CONFIG
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 2195d89..13a3c39 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -170,10 +170,10 @@ $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h:
$(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
-openssl-release-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\Configure
+openssl-release-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\ConfigureR
title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Release
cd $(ROOT_DIR)\$(OPENSSL_DIR)
- $(PERL) Configure VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
+ $(PERL) ConfigureR VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
openssl-debug-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\ConfigureD
title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Debug
@@ -258,7 +258,7 @@ curl-debug: test-env openssl-debug zlib-debug
ZLIB_LFLAGS=/libpath:$(ROOT_DIR)$(ZLIB_DIR)\$(ZlibTargetDir)\DEBUG \
ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I$(ROOT_DIR)$(ZLIB_DIR)" \
ZLIB_LIBS=$(ZLIB_IMPLIB)D.lib SSL_LIBS="libcrypto.lib libssl.lib" \
- BASE_NAME=libcurl5 BASE_NAME_DEBUG=libcurl5d
+ BASE_NAME=libcurl$(LIBCURL_FILE_VERSION) BASE_NAME_DEBUG=libcurl$(LIBCURL_FILE_VERSION)d
curl-release: test-env openssl-release zlib-release
title Build curl $(VSCMD_ARG_TGT_ARCH) Release
@@ -268,7 +268,7 @@ curl-release: test-env openssl-release zlib-release
ZLIB_LFLAGS=/libpath:$(ROOT_DIR)$(ZLIB_DIR)\$(ZlibTargetDir)\Release \
ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I$(ROOT_DIR)$(ZLIB_DIR)" \
ZLIB_LIBS=$(ZLIB_IMPLIB).lib SSL_LIBS="libcrypto.lib libssl.lib" \
- BASE_NAME=libcurl5 BASE_NAME_DEBUG=libcurl5d
+ BASE_NAME=libcurl$(LIBCURL_FILE_VERSION) BASE_NAME_DEBUG=libcurl$(LIBCURL_FILE_VERSION)d
curl-clean: curl-test
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list