Browse Source

Add vs2017 to the build images

pull/216/head
sigman 9 years ago committed by Vladimír Vondruš
parent
commit
e287c3c410
  1. 3
      package/ci/appveyor-desktop-gles.bat
  2. 3
      package/ci/appveyor-desktop.bat
  3. 9
      package/ci/appveyor-rt.bat
  4. 23
      package/ci/appveyor.yml

3
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% set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH%
rem Build Corrade rem Build Corrade

3
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% set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH%
rem Build Corrade rem Build Corrade

9
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% set PATH=%APPVEYOR_BUILD_FOLDER%\deps-native\bin;%PATH%
rem Build ANGLE rem Build ANGLE
@ -39,7 +42,7 @@ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DWITH_INTERCONNECT=OFF ^ -DWITH_INTERCONNECT=OFF ^
-DBUILD_STATIC=ON ^ -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 cmake --build . --config Release --target install -- /m /v:m || exit /b
cd .. || exit /b cd .. || exit /b
@ -72,5 +75,5 @@ cmake .. ^
-DBUILD_TESTS=ON ^ -DBUILD_TESTS=ON ^
-DBUILD_STATIC=ON ^ -DBUILD_STATIC=ON ^
-DBUILD_PLUGINS_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 cmake --build . --config Release -- /m /v:m || exit /b

23
package/ci/appveyor.yml

@ -2,22 +2,41 @@
clone_depth: 1 clone_depth: 1
os: Visual Studio 2015
environment: environment:
matrix: matrix:
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TARGET: desktop
COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TARGET: desktop - TARGET: desktop
COMPILER: mingw COMPILER: mingw
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- TARGET: desktop-gles - TARGET: desktop-gles
TARGET_GLES2: ON 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: desktop-gles
TARGET_GLES2: OFF 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: rt
TARGET_GLES2: ON 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: rt
TARGET_GLES2: OFF TARGET_GLES2: OFF
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
notifications: notifications:
- provider: Webhook - provider: Webhook

Loading…
Cancel
Save