From e287c3c410a9dfa35d2e054c63d4504b4d5f6ffc Mon Sep 17 00:00:00 2001 From: sigman Date: Sat, 10 Jun 2017 17:18:24 +0300 Subject: [PATCH] Add vs2017 to the build images --- package/ci/appveyor-desktop-gles.bat | 3 ++- package/ci/appveyor-desktop.bat | 3 ++- package/ci/appveyor-rt.bat | 9 ++++++--- package/ci/appveyor.yml | 23 +++++++++++++++++++++-- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 755cb6397..1179062ba 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -1,4 +1,5 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% rem Build Corrade diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index f377c182e..355274b38 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -1,4 +1,5 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% rem Build Corrade diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index 760f1d64f..1bc032b9b 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -1,4 +1,7 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set GENERATOR=Visual Studio 14 2015 +if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set GENERATOR=Visual Studio 15 2017 set PATH=%APPVEYOR_BUILD_FOLDER%\deps-native\bin;%PATH% rem Build ANGLE @@ -39,7 +42,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DWITH_INTERCONNECT=OFF ^ -DBUILD_STATIC=ON ^ - -G "Visual Studio 14 2015" -A x64 || exit /b + -G "%GENERATOR%" -A x64 || exit /b cmake --build . --config Release --target install -- /m /v:m || exit /b cd .. || exit /b @@ -72,5 +75,5 @@ cmake .. ^ -DBUILD_TESTS=ON ^ -DBUILD_STATIC=ON ^ -DBUILD_PLUGINS_STATIC=ON ^ - -G "Visual Studio 14 2015" -A x64 || exit /b + -G "%GENERATOR%" -A x64 || exit /b cmake --build . --config Release -- /m /v:m || exit /b diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index e37407c20..3318abcb1 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -2,22 +2,41 @@ clone_depth: 1 -os: Visual Studio 2015 - environment: matrix: - TARGET: desktop COMPILER: msvc + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - TARGET: desktop + COMPILER: msvc + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TARGET: desktop COMPILER: mingw + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TARGET: desktop-gles TARGET_GLES2: ON + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - TARGET: desktop-gles + TARGET_GLES2: ON + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TARGET: desktop-gles TARGET_GLES2: OFF + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - TARGET: desktop-gles + TARGET_GLES2: OFF + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - TARGET: rt + TARGET_GLES2: ON + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TARGET: rt TARGET_GLES2: ON + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - TARGET: rt + TARGET_GLES2: OFF + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TARGET: rt TARGET_GLES2: OFF + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 notifications: - provider: Webhook