[cpp-msbuild] 04/13: SSPCPP-765 OpenSSL Variables from the environment

[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=f3818fb071c05ef60d338b9ce3ac6bd2a35236b5

commit f3818fb071c05ef60d338b9ce3ac6bd2a35236b5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 6 10:54:47 2017 +0000

    SSPCPP-765 OpenSSL Variables from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 Versions.props               | 35 ++++++++++++++++++++++-------------
 dependencies/config.bat      | 10 ++++++++++
 dependencies/dependency.make |  8 --------
 env.make                     | 27 ++++++++++++++++++++++++++-
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/Versions.props b/Versions.props
index ca4d68b..df9ee04 100644
--- a/Versions.props
+++ b/Versions.props
@@ -69,19 +69,6 @@
     <XMLToolingComponent64d>{E4A7E0DE-7A88-4617-88A5-7FE499664B61}</XMLToolingComponent64d>
     <XMLToolingLiteComponent64d>{356BA4A0-2C00-489F-8274-18692A237DDB}</XMLToolingLiteComponent64d>
 
-    <OpenSSLVersion>1.1.0.6</OpenSSLVersion>
-    <OpenSSLDirVersion>1.1.0g</OpenSSLDirVersion>
-    <openssl>openssl-$(OpenSSLDirVersion)</openssl>
-    <OpenSSLFileVersion>1_1</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>
 
     <ShibbolethDllVersion>3.0.0</ShibbolethDllVersion>
     <ShibbolethDllFileVersion>3_0</ShibbolethDllFileVersion>
@@ -127,4 +114,26 @@
     <fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>
 
   </PropertyGroup>
+
+  <PropertyGroup Label="OpenSSLGeneral">
+    <!-- Just for now -->
+    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1</OPENSSL_FILE_VERSION>
+
+    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.0g</openssl>
+    <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
+  </PropertyGroup>
+
+  <PropertyGroup Label="OpenSSLGuids " Condition="'$(OPENSSL_FILE_VERSION)' == '1_1'">
+    <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>
+  </PropertyGroup>
+
 </Project>
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 730fcf0..27d32c3 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -48,7 +48,17 @@ set LOGSHIB_DIR=cpp-log4shib
 
 set XERCES_DIR=xerces-c-3.2.0
 
+##
+## OPENSSL CONFIG
+##
+## OPENSSL_DIR          is the directory name
+## OPENSSL_MM_VERSION   is the Merge Module version (and so have to be 4 dir separated numbers)
+## OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
+##                      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 SSLLib=libcrypto.lib;libssl.lib
 set SSLLib_space=libcrypto.lib libssl.lib
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 03c3a3b..390a47e 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -29,14 +29,6 @@ XercesInstallDir=Install64\VC15
 
 !Include ..\env.make
 
-!if "$(VISUALSTUDIOVERSION)" != "15.0"
-!error this code only known to work with VC15
-!endif
-
-!if "$(OPENSSL_DIR)" == ""
-!error OPENSSL_DIR not defined
-!endif
-
 !if "$(ZLIB_DIR)" == ""
 !error ZLIB_DIR not defined
 !endif
diff --git a/env.make b/env.make
index 87642c0..ab0a813 100644
--- a/env.make
+++ b/env.make
@@ -1,6 +1,10 @@
 ##
 ## Common Include file for Shibboleth nMake.
 ##
+!if "$(VISUALSTUDIOVERSION)" != "15.0"
+!error this code only known to work with VC15
+!endif
+
 
 !if "$(ROOT_DIR)" == ""
 !error ROOT_DIR not defined
@@ -14,6 +18,27 @@ PERL=perl
 SED=sed
 !endif
 
+!if "$(OPENSSL_DIR)" == ""
+!error OPENSSL_DIR not defined
+!endif
+
+!if "$(OPENSSL_MM_VERSION)" == ""
+!error OPENSSL_MM_VERSION not defined
+!endif
+
+!if "$(OPENSSL_MM_VERSION)" == ""
+!error OPENSSL_FILE_VERSION not defined
+!endif
+
+
 
 environment:
-	@echo	ROOT_DIR 		$(ROOT_DIR)
+	@echo ROOT_DIR	 			$(ROOT_DIR)
+	@echo SED             		$(SED)
+    @echo PERL            		$(PERL)
+    @echo
+    @echo OPENSSL_DIR			$(OPENSSL_DIR)
+    @echo OPENSSL_FILE_VERSION	$(OPENSSL_FILE_VERSION)
+    @echo OPENSSL_MM_VERSION	$(OPENSSL_MM_VERSION)
+	@echo
+	@echo

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