[cpp-msbuild] 07/13: SSPCPP-765 Santuario Variables from the environment
Rod Widdowson
rdw at steadingsoftware.com
Sun Dec 10 16:56:32 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=80e0501d63aa541c97d228bf78dceb20adc4309a
commit 80e0501d63aa541c97d228bf78dceb20adc4309a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 6 15:41:55 2017 +0000
SSPCPP-765 Santuario Variables from the environment
https://issues.shibboleth.net/jira/browse/SSPCPP-765
XSEC_DIR (all)
XSEC_FILE_VERSION, XSEC_MM_VERSION (Installer)
---
Versions.props | 29 ++++++++++++++++++++---------
dependencies/config.bat | 11 ++++++++++-
dependencies/dependency.make | 3 ---
dependencies/xsec.props | 2 +-
env.make | 15 +++++++++++++++
5 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/Versions.props b/Versions.props
index 4d1d321..eeb8a40 100644
--- a/Versions.props
+++ b/Versions.props
@@ -94,15 +94,6 @@
<Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
- <XmlSecVersion>2.0.0</XmlSecVersion>
- <xmlsec>xml-security-cpp</xmlsec>
- <XmlSecFileVersion>2_0</XmlSecFileVersion>
- <!-- Change the 4 components below iff XmlSecFileVersion changes -->
- <XmlSec32Component>{2B72E5CE-8E02-4AE6-AD0B-6AFDC4CFB49E}</XmlSec32Component>
- <XmlSec32Componentd>{05507D35-7B52-414B-8162-869C608A5AA9}</XmlSec32Componentd>
- <XmlSec64Component>{47FED010-3C5F-4940-A355-BDF8B621EBAD}</XmlSec64Component>
- <XmlSec64Componentd>{4C52E1DA-F04E-4479-9D8E-B4F97AF63805}</XmlSec64Componentd>
-
<ZlibVersion>1.2.11</ZlibVersion>
<zlib>zlib-$(ZlibVersion)</zlib>
<ZlibFileVersion>1_2</ZlibFileVersion>
@@ -138,4 +129,24 @@
<SSlEay64Componentd>{2512F0D0-CD50-4071-BECD-530EA83A4CCA}</SSlEay64Componentd>
</PropertyGroup>
+ <PropertyGroup Label="XSecGeneral">
+ <!-- Just for now -->
+ <XSEC_FILE_VERSION Condition="'$(XSEC_FILE_VERSION)' == ''">2_0</XSEC_FILE_VERSION>
+ <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'==''">2.0.0</XmlSecVersion>
+ <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'!=''">$(XSEC_MM_VERSION)</XmlSecVersion>
+ <xmlsec Condition="'$(XSEC_DIR)'==''">xml-security-cpp</xmlsec>
+ <xmlsec Condition="'$(XSEC_DIR)'!=''">$(XSEC_DIR)</xmlsec>
+ </PropertyGroup>
+
+ <PropertyGroup Label="XSecGuids " Condition="'$(XSEC_FILE_VERSION)' == '2_0'">
+ <XmlSecFileVersion>$(XSEC_FILE_VERSION)</XmlSecFileVersion>
+
+ <!-- Change the 4 components below iff XmlSecFileVersion changes -->
+ <XmlSec32Component>{2B72E5CE-8E02-4AE6-AD0B-6AFDC4CFB49E}</XmlSec32Component>
+ <XmlSec32Componentd>{05507D35-7B52-414B-8162-869C608A5AA9}</XmlSec32Componentd>
+ <XmlSec64Component>{47FED010-3C5F-4940-A355-BDF8B621EBAD}</XmlSec64Component>
+ <XmlSec64Componentd>{4C52E1DA-F04E-4479-9D8E-B4F97AF63805}</XmlSec64Componentd>
+ </PropertyGroup>
+
+
</Project>
diff --git a/dependencies/config.bat b/dependencies/config.bat
index cda34dc..27d7efc 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -52,7 +52,7 @@ set XERCES_DIR=xerces-c-3.2.0
## OPENSSL CONFIG
##
## OPENSSL_DIR is the directory name
-## OPENSSL_MM_VERSION is the Merge Module version (and so have to be 4 dir separated numbers)
+## OPENSSL_MM_VERSION is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
## OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
## if it changes you *MUST* change Version.props
set OPENSSL_DIR=openssl-1.1.0g
@@ -68,7 +68,16 @@ set OPENSSL_FILE_VERSION=1_1
Set LIBCURL_VERSION=7.57.0
set LIBCURL_DIR=curl-%LIBCURL_VERSION%
+##
+## XML SECURITY CONFIG
+##
+## XSEC_DIR is the directory name
+## XSEC_MM_VERSION is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
+## XSEC_FILE_VERSION is the distinction on the name of the DLLS
+## if it changes you *MUST* change Version.props
set XSEC_DIR=xml-security-cpp
+SET XSEC_FILE_VERSION=2_0
+SET XSEC_MM_VERSION=2.0.0
SET MsVCVersionNum=15
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index b236c38..38229e5 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -49,9 +49,6 @@ XercesInstallDir=Install64\VC15
!error XERCES_DIR not defined
!endif
-!if "$(XSEC_DIR)" == ""
-!error XSEC_DIR not defined
-!endif
##
## TARGETS
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 1bc939c..8b9e1d0 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -8,7 +8,7 @@
</ClCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out32dll.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x86Debug\lib;</AdditionalLibraryDirectories>
- <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib</AdditionalDependencies>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</Link>
</ItemDefinitionGroup>
diff --git a/env.make b/env.make
index 10c8613..0f3baf7 100644
--- a/env.make
+++ b/env.make
@@ -38,6 +38,17 @@ SED=sed
!error LIBCURL_VERSION not defined
!endif
+!if "$(XSEC_DIR)" == ""
+!error XSEC_DIR not defined
+!endif
+
+!if "$(XSEC_FILE_VERSION)" == ""
+!error XSEC_FILE_VERSION not defined
+!endif
+
+!if "$(XSEC_MM_VERSION)" == ""
+!error XSEC_MM_VERSION not defined
+!endif
environment:
@echo ROOT_DIR $(ROOT_DIR)
@@ -48,3 +59,7 @@ environment:
@echo OPENSSL_MM_VERSION $(OPENSSL_MM_VERSION)
@echo LIBCURL_VERSION $(LIBCURL_VERSION)
@echo LIBCURL_DIR $(LIBCURL_DIR)
+ @echo XSEC_DIR $(XSEC_DIR)
+ @echo XSEC_FILE_VERSION $(XSEC_FILE_VERSION)
+ @echo XSEC_MM_VERSION $(XSEC_MM_VERSION)
+
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list