[cpp-sp-resolver] branch master updated: SSPCPP-762 Initial port to VC15
Rod Widdowson
rdw at steadingsoftware.com
Wed Apr 11 10:51:16 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp-resolver.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp-resolver.git;a=commit;h=ddcd831d90b2d3dbc98bc6c5951ac1aa5f71783f
The following commit(s) were added to refs/heads/master by this push:
new ddcd831 SSPCPP-762 Initial port to VC15
ddcd831 is described below
commit ddcd831d90b2d3dbc98bc6c5951ac1aa5f71783f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 11 15:23:04 2018 +0100
SSPCPP-762 Initial port to VC15
https://issues.shibboleth.net/jira/browse/SSPCPP-762
Builds from the common (cpp-msbuild) environment.
---
.gitignore | 7 +++++++
cpp-sp-resolver.sln | 4 ++--
src/resolver-lite.vcxproj | 45 ++++++++++++++++++++++++++++++---------------
src/resolver.vcxproj | 41 ++++++++++++++++++++++++++---------------
4 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5c2ce91..21e237a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,13 +13,20 @@
*~
*.#*
.*.swp
+*.vcxproj.user
.DS_store
# Simulated Subversion default ignores end here
# The contents of the svn:ignore property on the branch root.
/Portfile
+/.vs
+src/shibresolver-lite-Debug
+src/Debug
/Debug
+src/Release
+src/shibresolver-lite-Release
/Release
/x64
+src/x64
/ipch
/*.suo
/*.sdf
diff --git a/cpp-sp-resolver.sln b/cpp-sp-resolver.sln
index ce02749..3dcd71c 100644
--- a/cpp-sp-resolver.sln
+++ b/cpp-sp-resolver.sln
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{3408DF00-FE03-41B1-AB95-9C45FF22DD44}"
ProjectSection(SolutionItems) = preProject
config_win32.h = config_win32.h
diff --git a/src/resolver-lite.vcxproj b/src/resolver-lite.vcxproj
index 6bb4343..e965a1d 100644
--- a/src/resolver-lite.vcxproj
+++ b/src/resolver-lite.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -36,21 +36,26 @@
<RootNamespace>myextension-lite</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>shibresolver-lite</ProjectName>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -68,6 +73,9 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
+ <Import Project="$(SolutionDir)..\BuildPath.props" />
+ <Import Project="$(SolutionDir)..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
@@ -90,14 +98,17 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_0</TargetName>
+ <IncludePath>$(BuildRoot)cpp-sp\;$(BuildRoot)cpp-opensaml;$(BuildRoot)cpp-xmltooling;$(IncludePath)</IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Platform)'=='Win32'">
+ <LibraryPath>$(BuildRoot)cpp-sp\Build\VC15\$(Configuration);$(BuildRoot)cpp-xmltooling\Build\VC15\$(Configuration);$(BuildRoot)cpp-opensaml\Build\VC15\$(Configuration);$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Platform)'=='x64'">
+ <LibraryPath>$(BuildRoot)cpp-sp\Build\VC15\x64\$(Configuration);$(BuildRoot)cpp-xmltooling\Build\VC15\x64\$(Configuration);$(BuildRoot)cpp-opensaml\Build\VC15\x64\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -111,12 +122,13 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>SHIBSP_LITE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp-lite1D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp-lite3D.lib;xmltooling-lite3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
@@ -131,12 +143,13 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp-lite1.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp-lite3.lib;xmltooling-lite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -159,12 +172,13 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>SHIBSP_LITE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp-lite1D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp-lite3D.lib;xmltooling-lite3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
@@ -181,12 +195,13 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp-lite1.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp-lite3.lib;xmltooling-lite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -197,4 +212,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/resolver.vcxproj b/src/resolver.vcxproj
index bc721b6..d75951a 100644
--- a/src/resolver.vcxproj
+++ b/src/resolver.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -36,21 +36,26 @@
<RootNamespace>myextension</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>shibresolver</ProjectName>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -68,6 +73,9 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
+ <Import Project="$(SolutionDir)..\BuildPath.props" />
+ <Import Project="$(SolutionDir)..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
@@ -90,14 +98,17 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath)</IncludePath>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_0</TargetName>
+ <IncludePath>$(BuildRoot)cpp-sp\;$(BuildRoot)cpp-opensaml;$(BuildRoot)cpp-xmltooling;$(IncludePath)</IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Platform)'=='Win32'">
+ <LibraryPath>$(BuildRoot)cpp-sp\Build\VC15\$(Configuration);$(BuildRoot)cpp-xmltooling\Build\VC15\$(Configuration);$(BuildRoot)cpp-opensaml\Build\VC15\$(Configuration);$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Platform)'=='x64'">
+ <LibraryPath>$(BuildRoot)cpp-sp\Build\VC15\x64\$(Configuration);$(BuildRoot)cpp-xmltooling\Build\VC15\x64\$(Configuration);$(BuildRoot)cpp-opensaml\Build\VC15\x64\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -116,7 +127,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp1D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp3D.lib;saml3D.lib;xmltooling3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -134,7 +145,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp1.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp3.lib;saml3.lib;xmltooling3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -163,7 +174,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp1D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;shibsp3D.lib;saml3D.lib;xmltooling3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -183,7 +194,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp1.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;shibsp3.lib;saml3.lib;xmltooling3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -195,4 +206,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list