From 683f8d93047568dd444c2eb3c4b29b44d9202083 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 11 Jul 2016 02:31:38 +1000 Subject: [PATCH] project: Update AppVeyor CI to use gitlink. --- SMP/appveyor.yml | 46 +++++++++++++++++++++++++++++++++++++++------ SMP/libzlib.sln | 30 ++++++++++++++--------------- SMP/libzlib.vcxproj | 2 ++ 3 files changed, 57 insertions(+), 21 deletions(-) diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml index ccf113b42..83c7d0597 100644 --- a/SMP/appveyor.yml +++ b/SMP/appveyor.yml @@ -4,29 +4,51 @@ branches: only: - master skip_non_tags: true -configuration: Release+ReleaseDLL shallow_clone: true +configuration: Release+ReleaseDLL + +platform: x86+x64 + environment: matrix: - - MSVC_VER: 14 - MSVC_VER: 12 + - MSVC_VER: 14 + +install: +# Install GitLink +- cmd: choco install gitlink before_build: +# Create build project to compile all configurations and platforms at once - ps: >- $script = @' - + - + + - + %(PlatformList.Identity) - + + + Configuration=%(ConfigurationList.Identity);Platform=$(CurrentPlatform);OutDir=$(MSBuildThisFileDirectory)build_out\ + + + + + + + + + %(PlatformList.Identity) + + @@ -35,10 +57,22 @@ before_build: $script = $script -replace "APPVEYOR_PROJECT_NAME", "$env:APPVEYOR_PROJECT_NAME" + $script = $script -replace "APPVEYOR_REPO_NAME", "$env:APPVEYOR_REPO_NAME" + + $script = $script -replace "APPVEYOR_REPO_COMMIT", "$env:APPVEYOR_REPO_COMMIT" + $script | Out-File build.vcxproj + +# Backup platform so it is not affected by vcvars +- cmd: SET PLATFORMBACK=%PLATFORM% + +# Setup msvc environment for required compiler version (specified by MSVC_VER) - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:MSVC_VER" + "0COMNTOOLS")) - cmd: call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" amd64 +# Reset platform +- cmd: SET PLATFORM=%PLATFORMBACK% + build: project: build.vcxproj parallel: true diff --git a/SMP/libzlib.sln b/SMP/libzlib.sln index c3cb18683..29e6365a4 100644 --- a/SMP/libzlib.sln +++ b/SMP/libzlib.sln @@ -6,38 +6,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzlib", "libzlib.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugDLL|Win32 = DebugDLL|Win32 + Debug|x86 = Debug|x86 DebugDLL|x64 = DebugDLL|x64 - Release|Win32 = Release|Win32 + DebugDLL|x86 = DebugDLL|x86 Release|x64 = Release|x64 - ReleaseDLL|Win32 = ReleaseDLL|Win32 + Release|x86 = Release|x86 ReleaseDLL|x64 = ReleaseDLL|x64 - ReleaseLTO|Win32 = ReleaseLTO|Win32 + ReleaseDLL|x86 = ReleaseDLL|x86 ReleaseLTO|x64 = ReleaseLTO|x64 + ReleaseLTO|x86 = ReleaseLTO|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|Win32.Build.0 = Debug|Win32 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|x64.ActiveCfg = Debug|x64 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|x64.Build.0 = Debug|x64 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|x86.ActiveCfg = Debug|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Debug|x86.Build.0 = Debug|Win32 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|Win32.ActiveCfg = Release|Win32 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|Win32.Build.0 = Release|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.DebugDLL|x86.Build.0 = DebugDLL|Win32 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|x64.ActiveCfg = Release|x64 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|x64.Build.0 = Release|x64 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|x86.ActiveCfg = Release|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.Release|x86.Build.0 = Release|Win32 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|Win32.ActiveCfg = ReleaseLTO|Win32 - {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|Win32.Build.0 = ReleaseLTO|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64 {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32 + {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SMP/libzlib.vcxproj b/SMP/libzlib.vcxproj index e9db346da..31c8da731 100644 --- a/SMP/libzlib.vcxproj +++ b/SMP/libzlib.vcxproj @@ -759,6 +759,7 @@ del /f /q $(OutDir)\licenses\zlib.txt $(OutDir)\bin\x86\$(TargetName)$(TargetExt) ..\contrib\vstudio\vc11\zlibvc.def true + true true @@ -827,6 +828,7 @@ del /f /q $(OutDir)\licenses\zlib.txt $(IntDir)\$(TargetName).pgd $(OutDir)\lib\x64\$(TargetName).lib ..\contrib\vstudio\vc11\zlibvc.def + true true