From 9bb88fc0170f209bfb39e0525f765f7690260e64 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 11 Jul 2016 02:59:12 +1000 Subject: [PATCH] project: Update AppVeyor CI to use gitlink. --- SMP/appveyor.yml | 54 ++++++++++++++++++++++++++++++++++++++-------- SMP/libvpx.sln | 32 +++++++++++++-------------- SMP/libvpx.vcxproj | 2 ++ 3 files changed, 63 insertions(+), 25 deletions(-) diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml index 0e3b9ecfd..99350c0fd 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,16 +57,30 @@ 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% + +# Download and install yasm integration - ps: (New-Object Net.WebClient).DownloadFile('http://www.tortall.net/projects/yasm/releases/vsyasm-1.3.0-win64.zip', "$pwd\yasm.zip") -- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\yasm.zip", "$pwd\TempYASMUnpack"); +- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\yasm.zip", "$pwd\TempYASMUnpack") - ps: Move-Item -Force "TempYASMUnpack\*.exe" "$env:VSCOMNTOOLS\..\..\VC\bin" - ps: $env:MSBUILDDIR=((Get-Command msbuild.exe).Path | Split-Path -parent) - ps: (Get-Content "$pwd\TempYASMUnpack\vsyasm.props") -replace '\$\(Platform\)', 'win$(PlatformArchitecture)' | Set-Content "$pwd\TempYASMUnpack\vsyasm.props" - ps: Move-Item -Force "TempYASMUnpack\*.*" "$env:MSBUILDDIR\..\..\..\Microsoft.Cpp\v4.0\V${env:MSVC_VER}0\BuildCustomizations" - + build: project: build.vcxproj parallel: true diff --git a/SMP/libvpx.sln b/SMP/libvpx.sln index c05bb786a..8b86be703 100644 --- a/SMP/libvpx.sln +++ b/SMP/libvpx.sln @@ -1,43 +1,43 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvpx", "libvpx.vcxproj", "{8293418A-603A-4119-B7B4-1E6204606BA9}" 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 - {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|Win32.Build.0 = Debug|Win32 {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|x64.ActiveCfg = Debug|x64 {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|x64.Build.0 = Debug|x64 - {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|x86.ActiveCfg = Debug|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.Debug|x86.Build.0 = Debug|Win32 {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|Win32.ActiveCfg = Release|Win32 - {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|Win32.Build.0 = Release|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.DebugDLL|x86.Build.0 = DebugDLL|Win32 {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|x64.ActiveCfg = Release|x64 {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|x64.Build.0 = Release|x64 - {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|x86.ActiveCfg = Release|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.Release|x86.Build.0 = Release|Win32 {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|Win32.ActiveCfg = ReleaseLTO|Win32 - {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|Win32.Build.0 = ReleaseLTO|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32 {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64 {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64 + {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32 + {8293418A-603A-4119-B7B4-1E6204606BA9}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SMP/libvpx.vcxproj b/SMP/libvpx.vcxproj index 6762813da..16720f48e 100644 --- a/SMP/libvpx.vcxproj +++ b/SMP/libvpx.vcxproj @@ -1343,6 +1343,7 @@ del /f /q $(OutDir)\licenses\libvpx.txt .\libvpx.def $(IntDir)\$(TargetName).pgd true + true mkdir $(OutDir)\include @@ -1428,6 +1429,7 @@ del /f /q $(OutDir)\licenses\libvpx.txt $(OutDir)\lib\x64\$(TargetName).pdb .\libvpx.def $(IntDir)\$(TargetName).pgd + true mkdir $(OutDir)\include