[cpp-msbuild] 10/13: SSPCPP-765 Xerces 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=72f8f01ce4e0acb28ab64ac8549f773fa188aceb

commit 72f8f01ce4e0acb28ab64ac8549f773fa188aceb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Dec 9 13:00:32 2017 -0500

    SSPCPP-765 Xerces Variables from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
    
       XERCES_DIR (all)
       XERCES_FILE_VERSION, XERCES_MM_VERSION  (Installer)
---
 Versions.props               | 29 +++++++++++++++++++----------
 dependencies/config.bat      | 18 ++++++++++++++----
 dependencies/dependency.make | 15 ---------------
 env.make                     | 17 ++++++++++++++++-
 4 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/Versions.props b/Versions.props
index 5230eb4..0a85621 100644
--- a/Versions.props
+++ b/Versions.props
@@ -84,15 +84,6 @@
     <ShibDll64Componentd>{53AE4EDF-5E73-4728-81B6-532E383FE2E0}</ShibDll64Componentd>
     <ShibDllLite64Componentd>{DE702022-B4A3-47B0-8DEF-664897127808}</ShibDllLite64Componentd>
 
-    <XercesVersion>3.2.0</XercesVersion>
-    <xerces>xerces-c-$(XercesVersion)</xerces>
-    <XercesFileVersion>3_2</XercesFileVersion>
-    <!-- Change the 4 components below iff XercesFileVersion changes -->
-    <Xerces32Component>{703F33E0-715F-4301-8554-2D3F9AE2CD4B}</Xerces32Component>
-    <Xerces32Componentd>{568D5E45-9E2B-44ED-8ECE-E5E61B658733}</Xerces32Componentd>
-    <Xerces64Component>{C43D408D-ADB6-4C19-986C-18B4E5DE1315}</Xerces64Component>
-    <Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
-
 
     <FastCGIVersion>2.4.0</FastCGIVersion>
     <fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>
@@ -154,7 +145,7 @@
     <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>
+    <zlib Condition="'$(ZLIB_DIR)'!=''">'$(ZLIB_DIR)</zlib>
   </PropertyGroup>
 
   <PropertyGroup Label="ZLibGuids " Condition="'$(ZLIB_FILE_VERSION)' == '1_2_11'">
@@ -166,5 +157,23 @@
     <Zlib64Componentd>{4FEB4C6E-E96E-4C63-94C6-6EE4C84AC0C5}</Zlib64Componentd>
   </PropertyGroup>
 
+  <PropertyGroup Label="XercesGeneral">
+    <!-- Just for now -->
+	<XERCES_FILE_VERSION Condition="'$(XERCES_FILE_VERSION)' == ''">3_2</XERCES_FILE_VERSION>
+    <XercesVersion Condition="'$(ZLIB_MM_VERSION)'==''">1.2.11</XercesVersion>
+    <XercesVersion Condition="'$(ZLIB_MM_VERSION)'!=''">$(ZLIB_MM_VERSION)</XercesVersion>
+    <xerces Condition="'$(XERCES_DIR)'==''">xerces-c-3.2.0</xerces>
+    <xerces Condition="'$(XERCES_DIR)'!=''">$(XERCES_DIR)</xerces>
+  </PropertyGroup>
+
+  <PropertyGroup Label="XercesGuids " Condition="'$(XERCES_FILE_VERSION)' == '3_2'">
+    <XsercesFileVersion>$(XERCES_FILE_VERSION)</ZlibFileVersion>
+    <!-- Change the 4 components below iff XercesFileVersion changes -->
+    <Xerces32Component>{703F33E0-715F-4301-8554-2D3F9AE2CD4B}</Xerces32Component>
+    <Xerces32Componentd>{568D5E45-9E2B-44ED-8ECE-E5E61B658733}</Xerces32Componentd>
+    <Xerces64Component>{C43D408D-ADB6-4C19-986C-18B4E5DE1315}</Xerces64Component>
+    <Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
+  </PropertyGroup>
+
 
 </Project>
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 3357974..c8cca0a 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -57,10 +57,6 @@ goto path_done
 
 :path_done
 
-set LOGSHIB_DIR=cpp-log4shib
-
-set XERCES_DIR=xerces-c-3.2.0
-
 ##
 ## OPENSSL CONFIG
 ##
@@ -100,6 +96,20 @@ set ZLIB_MM_VERSION=1.2.11
 set ZLIB_IMPLIB=zlib1
 set ZLIB_FILE_VERSION=1_2_11
 
+##
+## LOG4SHIB CONFIG
+##
+set LOGSHIB_DIR=cpp-log4shib
+
+##
+## XERCES CONFIG
+##
+set XERCES_DIR=xerces-c-3.2.0
+set XERCES_FILE_VERSION=3_2
+set XERCES_MM_VERSION=3.2.0
+
+
+
 
 SET MsVCVersionNum=15
 
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index cd75301..552ac1f 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -35,11 +35,6 @@ ZLIB_SHAREDLIB=zlib$(ZLIB_FILE_VERSION)
 !error LOGSHIB_DIR not defined
 !endif
 
-!if "$(XERCES_DIR)" == ""
-!error XERCES_DIR not defined
-!endif
-
-
 ##
 ## TARGETS
 ##
@@ -50,16 +45,6 @@ help:
 	@echo "         zlib targets: zlib zlib-(clean|debug|release)
 	@echo "	        log4shib targets: log4shib log4shib-(clean|debug|release)
 	@echo "
-	@echo "REQUIRED VARIABLES
-	@echo "			ROOT_DIR
-	@echo "			OPENSSL_DIR
-	@echo "			SLIB_DIR, ZLIB_SHAREDLIB, ZLIB_IMPLIB
-	@echo "			LOGSHIB_DIR (sic)
-	@echo "			XERCES_DIR
-	@echo "			LIBCURL_DIR
-	@echo "			XSEC_DIR
-	@echo "
-	@echo "
 	@echo " See also https://wiki.shibboleth.net/confluence/display/SP3/WindowsBuild
 
 clean: openssl-clean zlib-clean log4shib-clean xerces-clean curl-clean xsec-clean
diff --git a/env.make b/env.make
index 2442766..ff437c7 100644
--- a/env.make
+++ b/env.make
@@ -71,7 +71,8 @@ SED=sed
 
 !if "$(APACHE_24_ROOT64)" == ""
 !error APACHE_24_ROOT64 not defined
-	!endif
+!endif
+
 
 !if "$(ZLIB_DIR)" == ""
 !error ZLIB_DIR not defined
@@ -90,6 +91,19 @@ SED=sed
 !endif
 
 
+!if "$(XERCES_DIR)" == ""
+!error XERCES_DIR not defined
+!endif
+
+!if "$(XERCES_MM_VERSION)" == ""
+!error XERCES_MM_VERSION not defined
+!endif
+
+!if "$(XERCES_FILE_VERSION)" == ""
+!error XERCES_FILE_VERSION not defined
+!endif
+
+
 environment:
 	@echo ROOT_DIR	 			$(ROOT_DIR)
 	@echo SED             		$(SED)
@@ -118,3 +132,4 @@ 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.