[cpp-msbuild] 02/02: CPPXT-110 OpenSSL 1.1: New build mechanisms

Rod Widdowson rdw at steadingsoftware.com
Wed Dec 7 05:17:17 EST 2016 

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=f3ace478c70fe7f2a32a919a66eb96e3d1e35fd0

commit f3ace478c70fe7f2a32a919a66eb96e3d1e35fd0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Dec 6 17:32:56 2016 +0000

    CPPXT-110 OpenSSL 1.1: New build mechanisms
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
    
    Add the new paths for where to collect OpenSSL lib and headers
    (backwards compatible)
    
    Add new property for the LibCurl library name.  Benign until
    the xmltooling.vcxproj file hit at which stage it becomes backwards
    compatible.
---
 Includes.props | 28 ++++++++++++++++++++++------
 Versions.props |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Includes.props b/Includes.props
index 3ba60d9..dce95e0 100644
--- a/Includes.props
+++ b/Includes.props
@@ -1,19 +1,35 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Wibble">
+    <LibCurlLib Condition="'$(NewCurlBuild)' == '1'">libcurl5.lib</LibCurlLib>
+    <LibCurlLibD Condition="'$(NewCurlBuild)' == '1'">libcurl5d.lib</LibCurlLibD>
+    <LibCurlLib Condition="'$(NewCurlBuild)' != '1'">libcurl5_imp.lib</LibCurlLib>
+    <LibCurlLibD Condition="'$(NewCurlBuild)' != '1'">libcurl5d_imp.lib</LibCurlLibD>
+
     <SSLLib Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32.lib;libeay32.lib</SSLLib>
     <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32D.lib;libeay32D.lib</SSLLibD>
     <SSLLib Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLib>
     <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLibD>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\x86\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64Debug\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
     <ReferencePath>$(ReferencePath)</ReferencePath>
 
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\$(fcgi)\Win32\Debug;$(BuildRoot)\$(zlib)\Debug;$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\$(fcgi)\Win32\Release;$(BuildRoot)\$(zlib)\Release;$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\Debug;$(BuildRoot)\$(zlib)\x64\Debug;$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\Release;$(BuildRoot)\$(zlib)\x64\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-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)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\ [...]
+
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-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)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Release No Xa [...]
+
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-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)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\D [...]
+
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-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)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x6 [...]
     <SourcePath>$(SourcePath)</SourcePath>
+
     <ExcludePath>$(ExcludePath)</ExcludePath>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Versions.props b/Versions.props
index 2ad0540..b0bf03b 100644
--- a/Versions.props
+++ b/Versions.props
@@ -18,6 +18,7 @@
     <!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
     <ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
 
+<!--    <NewCurlBuild>1</NewCurlBuild>  -->
     <CurlVersion>7.51.0</CurlVersion>
     <curl>curl-$(CurlVersion)</curl>
 

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

More information about the commits mailing list