[cpp-msbuild] 08/13: SSPCPP-765 Apache 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=d5f21626c3d1cbf84fad0a423f12744bb38d6a4d

commit d5f21626c3d1cbf84fad0a423f12744bb38d6a4d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 6 11:36:44 2017 +0000

    SSPCPP-765 Apache Variables from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 Versions.props          |  9 +++++++++
 build.make              |  2 +-
 dependencies/config.bat | 17 +++++++++++++++++
 env.make                | 41 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/Versions.props b/Versions.props
index eeb8a40..fb51cf6 100644
--- a/Versions.props
+++ b/Versions.props
@@ -108,6 +108,15 @@
 
   </PropertyGroup>
 
+  <PropertyGroup Label="Apache">
+        <Apache13Root Condition="'$(Apache13Root)'==''">$(APACHE_13_ROOT)</Apache13Root>
+        <Apache20Root Condition="'$(Apache20Root)'==''">$(APACHE_20_ROOT)</Apache20Root>
+        <Apache22Root Condition="'$(Apache22Root)'==''">$(APACHE_22_ROOT)</Apache22Root>
+        <Apache22Root64 Condition="'$(Apache22Root64)'==''">$(APACHE_22_ROOT64)</Apache22Root64>
+        <Apache24Root Condition="'$(Apache24Root)'==''">$(APACHE_24_ROOT)</Apache24Root>
+        <Apache24Root64 Condition="'$(Apache24Root64)'==''">$(APACHE_24_ROOT64)</Apache24Root64>
+  </PropertyGroup>
+
   <PropertyGroup Label="OpenSSLGeneral">
     <!-- Just for now -->
     <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1</OPENSSL_FILE_VERSION>
diff --git a/build.make b/build.make
index 11e1c11..601c4bb 100644
--- a/build.make
+++ b/build.make
@@ -1,4 +1,4 @@
-!Include ..\env.make
+!Include env.make
 #
 # Short cuts to make things easier
 #
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 27d7efc..e3ee383 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -1,9 +1,26 @@
 rem ROOT_DIR HAS TO HAVE TRAILING SLASH
 
 if "%1" NEQ "" goto %1%
+
+#
+# DEFAULT SETTINGS (for Scott)
+#
+
 set ROOT_DIR=C:\Users\cantor.2\Shibboleth\
 set VS_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
 set SED=C:\cygwin64\bin\sed.exe
+
+
+#
+# Apache Config
+#
+SET APACHE_13_ROOT=%ROOT_DIR%apache\VC10\Apache
+SET APACHE_20_ROOT=%ROOT_DIR%apache\VC10\Apache2.0.63\Apache
+SET APACHE_22_ROOT=%ROOT_DIR%apache\VC10\Apache2
+SET APACHE_22_ROOT64=%ROOT_DIR%apache\VC10\Apache22-64
+SET APACHE_24_ROOT=%ROOT_DIR%apache\VC10\Apache24
+SET APACHE_24_ROOT64=%ROOT_DIR%apache\VC10\Apache24-64
+
 goto path_done
 
 :ROD
diff --git a/env.make b/env.make
index 0f3baf7..3ad421a 100644
--- a/env.make
+++ b/env.make
@@ -5,7 +5,6 @@
 !error this code only known to work with VC15
 !endif
 
-
 !if "$(ROOT_DIR)" == ""
 !error ROOT_DIR not defined
 !endif
@@ -50,6 +49,30 @@ SED=sed
 !error XSEC_MM_VERSION not defined
 !endif
 
+#!if "$(APACHE_13_ROOT)" == ""
+#!error APACHE_13_ROOT not defined
+#!endif
+
+!if "$(APACHE_20_ROOT)" == ""
+!error APACHE_20_ROOT not defined
+!endif
+
+!if "$(APACHE_22_ROOT)" == ""
+!error APACHE_22_ROOT not defined
+!endif
+
+!if "$(APACHE_22_ROOT64)" == ""
+!error APACHE_22_ROOT64 not defined
+!endif
+
+!if "$(APACHE_24_ROOT)" == ""
+!error APACHE_24_ROOT not defined
+!endif
+
+!if "$(APACHE_24_ROOT64)" == ""
+!error APACHE_24_ROOT64 not defined
+	!endif
+
 environment:
 	@echo ROOT_DIR	 			$(ROOT_DIR)
 	@echo SED             		$(SED)
@@ -62,4 +85,20 @@ environment:
     @echo XSEC_DIR              $(XSEC_DIR)
     @echo XSEC_FILE_VERSION     $(XSEC_FILE_VERSION)
     @echo XSEC_MM_VERSION       $(XSEC_MM_VERSION)
+	@echo APACHE_13_ROOT		$(APACHE_13_ROOT)
+	@echo APACHE_20_ROOT		$(APACHE_20_ROOT)
+	@echo APACHE_22_ROOT		$(APACHE_22_ROOT)
+	@echo APACHE_22_ROOT64		$(APACHE_22_ROOT64)
+	@echo APACHE_24_ROOT		$(APACHE_24_ROOT)
+	@echo APACHE_24_ROOT64		$(APACHE_24_ROOT64)
+	@echo ZLIB_DIR				$(ZLIB_DIR)
+	@echo ZLIB_IMPLIB			$(ZLIB_IMPLIB)
+	@echo ZLIB_FILE_VERSION		$(ZLIB_FILE_VERSION)
+	@echo ZLIB_MM_VERSION		$(ZLIB_MM_VERSION)
+    @echo XERCES_DIR            $(XERCES_DIR)
+    @echo XERCES_FILE_VERSION   $(XERCES_FILE_VERSION)
+    @echo XERCES_MM_VERSION     $(XERCES_MM_VERSION)
+    @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.