[cpp-msbuild] branch master updated: CPPXT-123 XMLSecuirty Build changes
Rod Widdowson
rdw at steadingsoftware.com
Tue Sep 19 10:35:34 EDT 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=3ed22178e2da14308f58ca0a1d12fb5f9cda42f3
The following commit(s) were added to refs/heads/master by this push:
new 3ed2217 CPPXT-123 XMLSecuirty Build changes
3ed2217 is described below
commit 3ed22178e2da14308f58ca0a1d12fb5f9cda42f3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 19 15:34:24 2017 +0100
CPPXT-123 XMLSecuirty Build changes
https://issues.shibboleth.net/jira/browse/CPPXT-123
1) Major Version is now 2 (so names and GUIDS change)
2) The projects we need are now called Minimal, not No Xalan (so paths change)
---
Includes.props | 8 ++++----
Versions.props | 14 +++++++-------
dependencies/xmlsec-compile.bat | 8 ++++----
dependencies/xsec.props | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Includes.props b/Includes.props
index 0b06d22..c7c8aea 100644
--- a/Includes.props
+++ b/Includes.props
@@ -17,13 +17,13 @@
<ReferencePath>$(ReferencePath)</ReferencePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(Build [...]
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug Minimal;$(BuildRoot)\nsapi\lib;$(BuildR [...]
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Release N [...]
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Release M [...]
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\Win32 [...]
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug Minimal;$(BuildRoot)\$(fcgi)\Win32\ [...]
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi)\Win3 [...]
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release Minimal;$(BuildRoot)\$(fcgi)\Win32 [...]
<SourcePath>$(SourcePath)</SourcePath>
<ExcludePath>$(ExcludePath)</ExcludePath>
diff --git a/Versions.props b/Versions.props
index 676b787..693d27c 100644
--- a/Versions.props
+++ b/Versions.props
@@ -9,7 +9,7 @@
<!-- These control the version of the installer -->
<ShibbolethVersion>2.7.0</ShibbolethVersion>
- <ShibbolethPatchVersion>256</ShibbolethPatchVersion>
+ <ShibbolethPatchVersion>255</ShibbolethPatchVersion>
<!-- These control the versions in the DLLs and Executables.
Note that the PatchVersion is left to the individual resource file.
@@ -102,14 +102,14 @@
<Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
- <XmlSecVersion>1.8.0</XmlSecVersion>
+ <XmlSecVersion>2.0.0</XmlSecVersion>
<xmlsec>xml-security-c-$(XmlSecVersion)</xmlsec>
- <XmlSecFileVersion>1_8</XmlSecFileVersion>
+ <XmlSecFileVersion>2</XmlSecFileVersion>
<!-- Change the 4 components below iff XmlSecFileVersion changes -->
- <XmlSec32Component>{74006C7B-92FC-4a53-864A-6753EA09EAD6}</XmlSec32Component>
- <XmlSec32Componentd>{48235DA7-0FA9-46b8-AE9F-0BE4B90BDF04}</XmlSec32Componentd>
- <XmlSec64Component>{1102DB82-BDFB-4921-8AE0-C2CE99CDB651}</XmlSec64Component>
- <XmlSec64Componentd>{E5AFD662-5581-492c-8158-49AF7181EBFD}</XmlSec64Componentd>
+ <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>
diff --git a/dependencies/xmlsec-compile.bat b/dependencies/xmlsec-compile.bat
index 4233c1b..85fb1aa 100644
--- a/dependencies/xmlsec-compile.bat
+++ b/dependencies/xmlsec-compile.bat
@@ -2,14 +2,14 @@ rem xmlsec-compile Win64
rem xmlsec-compile Win32
set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan" /m /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug Minimal" /m /t:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan" /m /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m /t:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan" /m /t:Build /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug Minimal" /m /t:Build /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan" /m /t:Build /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m /t:Build /p:Platform=%1%
@if errorlevel 1 goto end
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 87cbd34..1a56fc5 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Minimal|Win32'">
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc32.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x86Debug\include;$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\include</AdditionalIncludeDirectories>
@@ -13,7 +13,7 @@
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Minimal|x64'">
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc64.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x64Debug\include;$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\include</AdditionalIncludeDirectories>
@@ -25,7 +25,7 @@
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Minimal|Win32'">
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc32;$(ROOT_DIR)$(OpenSSl_dir)\x86\include;$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\include</AdditionalIncludeDirectories>
@@ -37,7 +37,7 @@
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Minimal|x64'">
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc64;$(ROOT_DIR)$(OpenSSl_dir)\x64\include;$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\include</AdditionalIncludeDirectories>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list