[cpp-msbuild] 09/13: SSPCPP-765 zlib 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=038bf966a3ff391d5cbdc3d0b2875d8859c095e2

commit 038bf966a3ff391d5cbdc3d0b2875d8859c095e2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Dec 9 11:43:27 2017 -0500

    SSPCPP-765 zlib Variables from the environment
    
        https://issues.shibboleth.net/jira/browse/SSPCPP-765
    
        ZLIB_DIR (all)
        ZLIB_IMPLIB, (zlib)
        ZLIB_FILE_VERSION (zlib, Installer)
        ZLIB_MM_VERSION  (Installer)
---
 Versions.props               | 27 ++++++++++++++++++---------
 dependencies/config.bat      | 13 +++++++++----
 dependencies/dependency.make | 12 +-----------
 env.make                     | 18 +++++++++++++++++-
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/Versions.props b/Versions.props
index fb51cf6..5230eb4 100644
--- a/Versions.props
+++ b/Versions.props
@@ -94,15 +94,6 @@
     <Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
 
 
-    <ZlibVersion>1.2.11</ZlibVersion>
-    <zlib>zlib-$(ZlibVersion)</zlib>
-    <ZlibFileVersion>1_2</ZlibFileVersion>
-    <!-- Change the 4 components below iff ZlibFileVersion changes -->
-    <Zlib32Component>{13B4CBAF-D317-4982-BBF8-E32D57FACB14}</Zlib32Component>
-    <Zlib32Componentd>{ADEF973A-F7B8-40EF-80E8-C78B502AADB6}</Zlib32Componentd>
-    <Zlib64Component>{BEB38A55-FC0E-46E4-8B91-C650B9B6CA24}</Zlib64Component>
-    <Zlib64Componentd>{2DA91B41-CF31-473A-AF7B-BC13999654E6}</Zlib64Componentd>
-
     <FastCGIVersion>2.4.0</FastCGIVersion>
     <fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>
 
@@ -157,5 +148,23 @@
     <XmlSec64Componentd>{4C52E1DA-F04E-4479-9D8E-B4F97AF63805}</XmlSec64Componentd>
   </PropertyGroup>
 
+  <PropertyGroup Label="ZLibGeneral">
+    <!-- Just for now -->
+	<ZLIB_FILE_VERSION Condition="'$(ZSEC_FILE_VERSION)' == ''">1_2_11</ZLIB_FILE_VERSION>
+    <ZlibVersion Condition="'$(ZLIB_MM_VERSION)'==''">1.2.11</ZlibVersion>
+    <ZLibVersion Condition="'$(ZLIB_MM_VERSION)'!=''">$(ZLIB_MM_VERSION)</ZLibVersion>
+    <zlib Condition="'$(ZLIB_DIR)'==''">zlib-1.2.11</zlib>
+    <zlib Condition="'$(ZLIB_DIR)'!=''">$(ZLIB_DIR)</zlib>
+  </PropertyGroup>
+
+  <PropertyGroup Label="ZLibGuids " Condition="'$(ZLIB_FILE_VERSION)' == '1_2_11'">
+    <ZlibFileVersion>$(ZLIB_FILE_VERSION)</ZlibFileVersion>
+    <!-- Change the 4 components below iff ZlibFileVersion changes -->
+    <Zlib32Component>{D10691C0-E1D1-4CF6-BDDD-9F14B7DEAED1}</Zlib32Component>
+    <Zlib32Componentd>{D81C8108-F83F-4621-96C8-F48464E184AA}</Zlib32Componentd>
+    <Zlib64Component>{65F8ED60-06A0-4C50-B208-8B9900CC981A}</Zlib64Component>
+    <Zlib64Componentd>{4FEB4C6E-E96E-4C63-94C6-6EE4C84AC0C5}</Zlib64Componentd>
+  </PropertyGroup>
+
 
 </Project>
diff --git a/dependencies/config.bat b/dependencies/config.bat
index e3ee383..3357974 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -57,10 +57,6 @@ goto path_done
 
 :path_done
 
-set ZLIB_DIR=zlib-1.2.11
-set ZLIB_IMPLIB=zlib1
-set ZLIB_SHAREDLIB=zlib1_2_11
-
 set LOGSHIB_DIR=cpp-log4shib
 
 set XERCES_DIR=xerces-c-3.2.0
@@ -96,6 +92,15 @@ set XSEC_DIR=xml-security-cpp
 SET XSEC_FILE_VERSION=2_0
 SET XSEC_MM_VERSION=2.0.0
 
+##
+## ZLIB CONFIG
+##
+set ZLIB_DIR=zlib-1.2.11
+set ZLIB_MM_VERSION=1.2.11
+set ZLIB_IMPLIB=zlib1
+set ZLIB_FILE_VERSION=1_2_11
+
+
 SET MsVCVersionNum=15
 
 REM
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 38229e5..cd75301 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -28,18 +28,8 @@ XercesInstallDir=Install64\VC15
 !endif
 
 !Include ..\env.make
+ZLIB_SHAREDLIB=zlib$(ZLIB_FILE_VERSION)
 
-!if "$(ZLIB_DIR)" == ""
-!error ZLIB_DIR not defined
-!endif
-
-!if "$(ZLIB_SHAREDLIB)" == ""
-!error ZLIB_SHAREDLIB not defined
-!endif
-
-!if "$(ZLIB_IMPLIB)" == ""
-!error ZLIB_IMPLIB not defined
-!endif
 
 !if "$(LOGSHIB_DIR)" == ""
 !error LOGSHIB_DIR not defined
diff --git a/env.make b/env.make
index 3ad421a..2442766 100644
--- a/env.make
+++ b/env.make
@@ -73,6 +73,23 @@ SED=sed
 !error APACHE_24_ROOT64 not defined
 	!endif
 
+!if "$(ZLIB_DIR)" == ""
+!error ZLIB_DIR not defined
+!endif
+
+!if "$(ZLIB_FILE_VERSION)" == ""
+!error ZLIB_FILE_VERSION not defined
+!endif
+
+!if "$(ZLIB_IMPLIB)" == ""
+!error ZLIB_IMPLIB not defined
+!endif
+
+!if "$(ZLIB_MM_VERSION)" == ""
+!error ZLIB_MM_VERSION not defined
+!endif
+
+
 environment:
 	@echo ROOT_DIR	 			$(ROOT_DIR)
 	@echo SED             		$(SED)
@@ -101,4 +118,3 @@ environment:
     @echo LOG4SHIB_DIR          $(LOG4SHIB_DIR)
     @echo LOG4SHIB_FILE_VERSION $(LOG4SHIB_FILE_VERSION)
     @echo LOG4SHIB_MM_VERSION   $(LOG4SHIB_MM_VERSION)
-

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