[cpp-msbuild] 06/13: SSPCPP-765 Curl 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=347740116693c293aeac4bb105d6fb8c379291a9

commit 347740116693c293aeac4bb105d6fb8c379291a9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 6 15:10:38 2017 +0000

    SSPCPP-765 Curl Variables from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 Versions.props               |  6 ++++--
 dependencies/config.bat      | 10 ++++++++--
 dependencies/dependency.make |  4 ----
 env.make                     | 12 +++++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Versions.props b/Versions.props
index df9ee04..4d1d321 100644
--- a/Versions.props
+++ b/Versions.props
@@ -35,8 +35,10 @@
     <!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
     <ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
 
-    <CurlVersion>7.57.0</CurlVersion>
-    <curl>curl-$(CurlVersion)</curl>
+    <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_65_1</boost>
     
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 22032b8..cda34dc 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -59,8 +59,14 @@ set OPENSSL_DIR=openssl-1.1.0g
 set OPENSSL_MM_VERSION=1.1.0.7
 set OPENSSL_FILE_VERSION=1_1
 
-set LIBCURL_DIR=curl-7.57.0
-set LIBCURL_NAME=libcurl5
+##
+## CURL CONFIG
+##
+## CURL_DIR             is the directory name
+## CURL_VERSION         is the version
+##
+Set LIBCURL_VERSION=7.57.0
+set LIBCURL_DIR=curl-%LIBCURL_VERSION%
 
 set XSEC_DIR=xml-security-cpp
 
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 390a47e..b236c38 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -49,10 +49,6 @@ XercesInstallDir=Install64\VC15
 !error XERCES_DIR not defined
 !endif
 
-!if "$(LIBCURL_DIR)" == ""
-!error LIBCURL_DIR not defined
-!endif
-
 !if "$(XSEC_DIR)" == ""
 !error XSEC_DIR not defined
 !endif
diff --git a/env.make b/env.make
index ab0a813..10c8613 100644
--- a/env.make
+++ b/env.make
@@ -30,15 +30,21 @@ SED=sed
 !error OPENSSL_FILE_VERSION not defined
 !endif
 
+!if "$(LIBCURL_DIR)" == ""
+!error LIBCURL_DIR not defined
+!endif
+
+!if "$(LIBCURL_VERSION)" == ""
+!error LIBCURL_VERSION not defined
+!endif
 
 
 environment:
 	@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
+	@echo LIBCURL_VERSION       $(LIBCURL_VERSION)
+	@echo LIBCURL_DIR           $(LIBCURL_DIR)

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