[cpp-msbuild] 12/13: SSPCPP-765 Log4Shib Variables from the environment

Rod Widdowson rdw at steadingsoftware.com
Sun Dec 10 16:56:37 EST 2017 

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=77d29248fd4ebcdf8b92319290d4b15f6685afb3

commit 77d29248fd4ebcdf8b92319290d4b15f6685afb3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Dec 9 13:25:18 2017 -0500

    SSPCPP-765 Log4Shib Variables from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
    
    LOG4SHIB_DIR (all)
    LOG4SHIB_FILE_VERSION, LOG4SHIB_MM_VERSION  (Installer)
    
    At the same time change LOGSHIB to LOG4SHIB.
---
 Versions.props               | 34 +++++++++++++++++++++-------------
 dependencies/config.bat      |  6 +++---
 dependencies/dependency.make | 19 +++++++------------
 env.make                     | 12 ++++++++++++
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/Versions.props b/Versions.props
index 0a85621..4d6b4dc 100644
--- a/Versions.props
+++ b/Versions.props
@@ -42,15 +42,6 @@
 
     <boost>boost_1_65_1</boost>
     
-    <Log4ShibVersion>1.0.10</Log4ShibVersion>
-    <Log4ShibFileVersion>1_0</Log4ShibFileVersion>
-    <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->
-    <Log4ShibComponent32>{2FDE8ED0-774A-4F44-88D5-C7089350D895}</Log4ShibComponent32>
-    <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>
-    <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>
-    <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>
-    <log4shib>cpp-log4shib</log4shib>
-
     <OpenSAMLVersion>3.0.0</OpenSAMLVersion>
     <OpenSAMLFileVersion>3_0</OpenSAMLFileVersion>
     <!-- Change the 4 components below iff the OpenSAMLFileVersion name changes -->
@@ -141,7 +132,7 @@
 
   <PropertyGroup Label="ZLibGeneral">
     <!-- Just for now -->
-	<ZLIB_FILE_VERSION Condition="'$(ZSEC_FILE_VERSION)' == ''">1_2_11</ZLIB_FILE_VERSION>
+	<ZLIB_FILE_VERSION Condition="'$(ZLIB_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>
@@ -160,14 +151,14 @@
   <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>
+    <XercesVersion Condition="'$(XERCES_MM_VERSION)'==''">1.2.11</XercesVersion>
+    <XercesVersion Condition="'$(XERCES_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>
+    <XercesFileVersion>$(XERCES_FILE_VERSION)</XercesFileVersion>
     <!-- Change the 4 components below iff XercesFileVersion changes -->
     <Xerces32Component>{703F33E0-715F-4301-8554-2D3F9AE2CD4B}</Xerces32Component>
     <Xerces32Componentd>{568D5E45-9E2B-44ED-8ECE-E5E61B658733}</Xerces32Componentd>
@@ -175,5 +166,22 @@
     <Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
   </PropertyGroup>
 
+  <PropertyGroup Label="Log4ShibGeneral">
+    <!-- Just for now -->
+	<LOG4SHIB_FILE_VERSION Condition="'$(LOG4SHIB_FILE_VERSION)' == ''">1_0</LOG4SHIB_FILE_VERSION>
+    <Log4ShibVersion Condition="'$(LOG4SHIB_MM_VERSION)' == ''">1.0.10</Log4ShibVersion>
+    <Log4ShibVersion Condition="'$(LOG4SHIB_MM_VERSION)' != ''">$(LOG4SHIB_MM_VERSION)</Log4ShibVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Log4ShibGuids" Condition="'$(LOG4SHIB_FILE_VERSION)' == '1_0'">
+    <Log4ShibFileVersion>$(LOG4SHIB_FILE_VERSION)</Log4ShibFileVersion>
+    <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->
+    <Log4ShibComponent32>{2FDE8ED0-774A-4F44-88D5-C7089350D895}</Log4ShibComponent32>
+    <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>
+    <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>
+    <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>
+    <log4shib>cpp-log4shib</log4shib>
+  </PropertyGroup>
 
 </Project>
+
diff --git a/dependencies/config.bat b/dependencies/config.bat
index c8cca0a..def125e 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -99,7 +99,9 @@ set ZLIB_FILE_VERSION=1_2_11
 ##
 ## LOG4SHIB CONFIG
 ##
-set LOGSHIB_DIR=cpp-log4shib
+set LOG4SHIB_DIR=cpp-log4shib
+set LOG4SHIB_MM_VERSION=1.0.10
+set LOG4SHIB_FILE_VERSION=1_0
 
 ##
 ## XERCES CONFIG
@@ -109,8 +111,6 @@ set XERCES_FILE_VERSION=3_2
 set XERCES_MM_VERSION=3.2.0
 
 
-
-
 SET MsVCVersionNum=15
 
 REM
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 360e2fa..2195d89 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -30,11 +30,6 @@ XercesInstallDir=Install64\VC15
 !Include ..\env.make
 ZLIB_SHAREDLIB=zlib$(ZLIB_FILE_VERSION)
 
-
-!if "$(LOGSHIB_DIR)" == ""
-!error LOGSHIB_DIR not defined
-!endif
-
 ##
 ## TARGETS
 ##
@@ -195,18 +190,18 @@ openssl-build: $(ROOT_DIR)\$(OPENSSL_DIR)\makefile
 log4shib: log4shib-debug log4shib-release
 
 log4shib-clean: log4shib-test
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug   /t:clean /p:Platform=Win32
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug   /t:clean /p:Platform=x64
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:clean /p:Platform=Win32
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:clean /p:Platform=x64
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug   /t:clean /p:Platform=Win32
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug   /t:clean /p:Platform=x64
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:clean /p:Platform=Win32
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:clean /p:Platform=x64
 
-log4shib-test: test-env $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln
+log4shib-test: test-env $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln
 
 log4shib-debug: log4shib-test
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug /t:build /p:Platform=$(MsBuildArch)
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Debug /t:build /p:Platform=$(MsBuildArch)
 
 log4shib-release: log4shib-test
-	msbuild /m  $(ROOT_DIR)\$(LOGSHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:build /p:Platform=$(MsBuildArch)
+	msbuild /m  $(ROOT_DIR)\$(LOG4SHIB_DIR)\msvc15\msvc15.sln  /p:Configuration=Release /t:build /p:Platform=$(MsBuildArch)
 
 #
 # Xerces
diff --git a/env.make b/env.make
index ff437c7..36203be 100644
--- a/env.make
+++ b/env.make
@@ -104,6 +104,18 @@ SED=sed
 !endif
 
 
+!if "$(LOG4SHIB_DIR)" == ""
+!error LOG4SHIB_DIR not defined
+!endif
+
+!if "$(LOG4SHIB_MM_VERSION)" == ""
+!error LOG4SHIB_MM_VERSION not defined
+!endif
+
+!if "$(LOG4SHIB_FILE_VERSION)" == ""
+!error LOG4SHIB_FILE_VERSION not defined
+!endif
+
 environment:
 	@echo ROOT_DIR	 			$(ROOT_DIR)
 	@echo SED             		$(SED)

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

More information about the commits mailing list