[cpp-msbuild] branch master updated: SSPCPP-689, CPPXT-106, CPPOST-94: Move build up to VC15/Visual Studio 2017

Rod Widdowson rdw at steadingsoftware.com
Thu Aug 31 10:35:12 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=9a7fe7b492399e91dd88129dfe70805d00bc2482

The following commit(s) were added to refs/heads/master by this push:
       new  9a7fe7b   SSPCPP-689, CPPXT-106, CPPOST-94: Move build up to VC15/Visual Studio 2017
9a7fe7b is described below

commit 9a7fe7b492399e91dd88129dfe70805d00bc2482
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 31 15:32:48 2017 +0100

    SSPCPP-689, CPPXT-106, CPPOST-94: Move build up to VC15/Visual Studio 2017
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    https://issues.shibboleth.net/jira/browse/CPPXT-106
    https://issues.shibboleth.net/jira/browse/CPPOST-94
---
 Includes.props |  8 ++++----
 Versions.props |  4 ++--
 build.make     | 17 +++--------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Includes.props b/Includes.props
index 4a561a3..0b06d22 100644
--- a/Includes.props
+++ b/Includes.props
@@ -6,14 +6,14 @@
     <SSLLib>libcrypto.lib;libssl.lib</SSLLib>
     <SSLLibD>libcrypto.lib;libssl.lib</SSLLibD>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\include;$(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)\Install32\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\x86\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\include;$(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)\Install64\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)$(openssl)\x64Debug\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\include;$(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)\Install64\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)$(openssl)\x64\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install64\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
 
     <ReferencePath>$(ReferencePath)</ReferencePath>
 
diff --git a/Versions.props b/Versions.props
index e56f59c..d03af34 100644
--- a/Versions.props
+++ b/Versions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="VersionMacros">
-    <MsVCVersion>vc10</MsVCVersion>
+    <MsVCVersion>vc15</MsVCVersion>
 
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
 
@@ -65,7 +65,7 @@
     <XMLToolingLiteComponent64d>{2BEAF032-2403-4b10-BE06-C0418D6B645F}</XMLToolingLiteComponent64d>
 
     <OpenSSLVersion>1.1.0.5</OpenSSLVersion>
-    <OpenSSLDirVersion>1.1.0.f</OpenSSLDirVersion>
+    <OpenSSLDirVersion>1.1.0f</OpenSSLDirVersion>
     <openssl>openssl-$(OpenSSLDirVersion)</openssl>
     <OpenSSLFileVersion>1_1_0_5</OpenSSLFileVersion>
     <!-- Change the 8 components below if OpenSSLFileVersion changes -->
diff --git a/build.make b/build.make
index 3da8749..723bb1d 100644
--- a/build.make
+++ b/build.make
@@ -4,22 +4,11 @@
 SPROOT=$(MAKEDIR)\..\cpp-sp
 XMLROOT=$(MAKEDIR)\..\cpp-xmltooling
 SAMLROOT=$(MAKEDIR)\..\cpp-opensaml
-VCVERSION=VC10
+VCVERSION=VC15
 
-!If "$(VCVERSION)" == "VC14"
+SERVER_MODULES_32=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
+SERVER_MODULES_64=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
 
-#SERVER_MODULES_32="Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_24"
-#SERVER_MODULES_64=$(SERVER_MODULES_32)
-
-SERVER_MODULES_32="Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
-SERVER_MODULES_64="Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
-
-!Else
-
-SERVER_MODULES_32="Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24";"Server Modules\nsapi_shib"
-SERVER_MODULES_64="Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
-
-!Endif
 
 
 

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

More information about the commits mailing list