[build] Update appveyor config to include msvc 2015 and 2017

1 files changed, 80 insertions, 33 deletions

diff --git a/appveyor.yml b/appveyor.yml
index eb53ad58b..9574e2d1f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,44 +1,15 @@
-os: Visual Studio 2015
 platform: x64
 
+image:
+- Visual Studio 2015
+- Visual Studio 2017
+
 environment:
   matrix:
   - configuration: Release
 
 shallow_clone: true
 
-cache:
-  - '%APPVEYOR_BUILD_FOLDER%\mason_packages'
-  - '%APPVEYOR_BUILD_FOLDER%\LLVM-5.0.1-win64.exe'
-  - '%APPVEYOR_BUILD_FOLDER%\cmake-3.10.1-win64-x64.zip'
-
-install:
-  - ps: |
-      if (!(Test-Path LLVM-5.0.1-win64.exe)) {
-          appveyor DownloadFile https://releases.llvm.org/5.0.1/LLVM-5.0.1-win64.exe
-      }
-      scripts\check-sha256.ps1 LLVM-5.0.1-win64.exe 981543611D719624ACB29A2CFFD6A479CFF36E8AB5EE8A57D8ECA4F9C4C6956F
-      Start-Process -FilePath 'LLVM-5.0.1-win64.exe' -ArgumentList '/S','/D=C:\LLVM-5.0.1' -Wait
-  - ps: |
-      if (!(Test-Path cmake-3.10.1-win64-x64.zip)) {
-          appveyor DownloadFile https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip
-      }
-      scripts\check-sha256.ps1 cmake-3.10.1-win64-x64.zip 8251F70C85B58F3CA1F24E4A3B0637E2D609B5E4A341D00B70E02E89244D5029
-      Start-Process -FilePath '7z' -ArgumentList 'x','cmake-3.10.1-win64-x64.zip','-oC:\' -Wait
-
-before_build:
-  - set PATH=C:\LLVM-5.0.1\bin;%PATH%
-  - set PATH=C:\cmake-3.10.1-win64-x64\bin;%PATH%
-  - set CC=clang-cl
-  - set CXX=clang-cl
-  - mkdir %APPVEYOR_BUILD_FOLDER%\build
-  - cd %APPVEYOR_BUILD_FOLDER%\build
-
-build_script:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-  - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.6.3\msvc2015_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" ..
-  - cmake --build . -- -j %NUMBER_OF_PROCESSORS%
-
 after_build:
   - mkdir qmapboxgl
   - mkdir qmapboxgl\lib
@@ -54,3 +25,79 @@ artifacts:
     name: QMapboxGL
 
 test: off
+
+
+for:
+-
+  matrix:
+    only:
+      - image: Visual Studio 2015
+
+  cache:
+    - '%APPVEYOR_BUILD_FOLDER%\mason_packages'
+    - '%APPVEYOR_BUILD_FOLDER%\LLVM-5.0.1-win64.exe'
+    - '%APPVEYOR_BUILD_FOLDER%\cmake-3.10.1-win64-x64.zip'
+
+  install:
+    - ps: |
+        if (!(Test-Path cmake-3.10.1-win64-x64.zip)) {
+            appveyor DownloadFile https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip
+        }
+        scripts\check-sha256.ps1 cmake-3.10.1-win64-x64.zip 8251F70C85B58F3CA1F24E4A3B0637E2D609B5E4A341D00B70E02E89244D5029
+        Start-Process -FilePath '7z' -ArgumentList 'x','cmake-3.10.1-win64-x64.zip','-oC:\' -Wait
+    - ps: |
+        if (!(Test-Path LLVM-5.0.1-win64.exe)) {
+            appveyor DownloadFile https://releases.llvm.org/5.0.1/LLVM-5.0.1-win64.exe
+        }
+        scripts\check-sha256.ps1 LLVM-5.0.1-win64.exe 981543611D719624ACB29A2CFFD6A479CFF36E8AB5EE8A57D8ECA4F9C4C6956F
+        Start-Process -FilePath 'LLVM-5.0.1-win64.exe' -ArgumentList '/S','/D=C:\LLVM-5.0.1' -Wait
+
+  before_build:
+    - set PATH=C:\LLVM-5.0.1\bin;%PATH%
+    - set PATH=C:\cmake-3.10.1-win64-x64\bin;%PATH%
+    - set CC=clang-cl
+    - set CXX=clang-cl
+    - mkdir %APPVEYOR_BUILD_FOLDER%\build
+    - cd %APPVEYOR_BUILD_FOLDER%\build
+
+  build_script:
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+    - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.6.3\msvc2015_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" ..
+    - cmake --build . -- -j %NUMBER_OF_PROCESSORS%
+
+-
+  matrix:
+    only:
+      - image: Visual Studio 2017
+
+  cache:
+    - '%APPVEYOR_BUILD_FOLDER%\mason_packages'
+    - '%APPVEYOR_BUILD_FOLDER%\LLVM-6.0.0-win64.exe'
+    - '%APPVEYOR_BUILD_FOLDER%\cmake-3.10.1-win64-x64.zip'
+
+  install:
+    - ps: |
+        if (!(Test-Path cmake-3.10.1-win64-x64.zip)) {
+            appveyor DownloadFile https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip
+        }
+        scripts\check-sha256.ps1 cmake-3.10.1-win64-x64.zip 8251F70C85B58F3CA1F24E4A3B0637E2D609B5E4A341D00B70E02E89244D5029
+        Start-Process -FilePath '7z' -ArgumentList 'x','cmake-3.10.1-win64-x64.zip','-oC:\' -Wait
+    - ps: |
+        if (!(Test-Path LLVM-6.0.0-win64.exe)) {
+            appveyor DownloadFile https://releases.llvm.org/6.0.0/LLVM-6.0.0-win64.exe
+        }
+        scripts\check-sha256.ps1 LLVM-6.0.0-win64.exe 2501887b2f638d3f65b0336f354b96f8108b563522d81e841d5c88c34af283dd
+        Start-Process -FilePath 'LLVM-6.0.0-win64.exe' -ArgumentList '/S','/D=C:\LLVM-6.0.0' -Wait
+
+  before_build:
+    - set PATH=C:\LLVM-6.0.0\bin;%PATH%
+    - set PATH=C:\cmake-3.10.1-win64-x64\bin;%PATH%
+    - set CC=clang-cl
+    - set CXX=clang-cl
+    - mkdir %APPVEYOR_BUILD_FOLDER%\build
+    - cd %APPVEYOR_BUILD_FOLDER%\build
+
+  build_script:
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+    - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.11.1\msvc2017_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" ..
+    - cmake --build . -- -j %NUMBER_OF_PROCESSORS%
\ No newline at end of file