Test additional AppVeyor builds

diff --git a/appveyor.yml b/appveyor.yml
index 2221c29698b9da8e79b82949c9ba1c79a9da9202..e1686b695dd2560e99fa8242cc57cecf8c96c78c 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,34 +23,54 @@ version: 1.0.{build}
 environment:
   matrix:
   - platform: msvc
-  - platform: vs2008
+  - platform: vs
+    vsversion: 2008
     arch: x86
-  - platform: vs2010
+  - platform: vs
+    vsversion: 2010
     arch: x86
-  - platform: vs2012
+  - platform: vs
+    vsversion: 2012
     arch: x86
-  - platform: vs2013
+  - platform: vs
+    vsversion: 2013
     arch: x86
-  - platform: vs2015
+  - platform: vs
+    vsversion: 2015
     arch: x86
-  - platform: vs2017
+  - platform: vs
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    vsversion: 2017
     arch: x86
-  - platform: vs2010_64
+  - platform: vs
+    vsversion: 2010
     arch: x64
-  - platform: vs2012_64
+  - platform: vs
+    vsversion: 2012
     arch: x64
-  - platform: vs2013_64
+  - platform: vs
+    vsversion: 2013
     arch: x64
-  - platform: vs2015_64
+  - platform: vs
+    vsversion: 2015
     arch: x64
-  - platform: vs2017_64
+  - platform: vs
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    vsversion: 2017
     arch: x64
-  - platform: vs2012_ARM
-  - platform: vs2013_ARM
-  - platform: vs2015_ARM
-  - platform: vs2017_ARM
+  - platform: vs
+    vsversion: 2012
+    arch: ARM
+  - platform: vs
+    vsversion: 2013
+    arch: ARM
+  - platform: vs
+    vsversion: 2015
+    arch: ARM
+  - platform: vs
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    vsversion: 2017
+    arch: ARM
   - platform: cygwin
   - platform: mingw32
   - platform: mingw64msys
@@ -64,10 +84,6 @@ clone_folder: c:\projects\check
 # scripts that are called at very beginning, before repo cloning
 init:
   - git config --global core.autocrlf input
-  - STRING(SUBSTRING %platform% 1 2 compiler_id)
-  - appveyor AddMessage -Category Information "Compiler ID : '%compiler_id%'"
-  - appveyor AddMessage -Category Information "Architecture: '%arch%'"
-
 
 #---------------------------------#
 #       build configuration       #
@@ -84,22 +100,37 @@ before_build:
   - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
   - if %platform%==msvc call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
   - if %platform%==msvc cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2005 cmake -G "Visual Studio 8 2005" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2008 cmake -G "Visual Studio 9 2008" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2010 cmake -G "Visual Studio 10 2010" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2012 cmake -G "Visual Studio 11 2012" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2013 cmake -G "Visual Studio 12 2013" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2015 cmake -G "Visual Studio 14 2015" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2017 cmake -G "Visual Studio 15 2017" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2010_64 cmake -G "Visual Studio 10 2010 Win64" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2012_64 cmake -G "Visual Studio 11 2012 Win64" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2013_64 cmake -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2015_64 cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2017_64 cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2012_ARM cmake -G "Visual Studio 11 2012 ARM" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2013_ARM cmake -G "Visual Studio 12 2013 ARM" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2015_ARM cmake -G "Visual Studio 14 2015 ARM" -DCMAKE_INSTALL_PREFIX=%P%
-  - if %platform%==vs2017_ARM cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_INSTALL_PREFIX=%P%
+  - if %platform%==vs (
+      set "makecommand=Visual Studio"
+    )
+  - if %vsversion%==2005 (
+      set "makecommand=%makecommand% 8 %vsversion%"
+    )
+  - if %vsversion%==2008 (
+      set "makecommand=%makecommand% 9 %vsversion%"
+    )
+  - if %vsversion%==2010 (
+      set "makecommand=%makecommand% 10 %vsversion%"
+    )
+  - if %vsversion%==2012 (
+      set "makecommand=%makecommand% 11 %vsversion%"
+    )
+  - if %vsversion%==2013 (
+      set "makecommand=%makecommand% 12 %vsversion%"
+    )
+  - if %vsversion%==2015 (
+      set "makecommand=%makecommand% 14 %vsversion%"
+    )
+  - if %vsversion%==2017 (
+      set "makecommand=%makecommand% 15 %vsversion%"
+    )
+  - if %arch%==x64 (
+      set "makecommand=%makecommand% Win64"
+    )
+  - if %arch%==ARM (
+      set "makecommand=%makecommand% ARM"
+    )
+  - if %platform%==vs cmake -G "%makecommand%" -DCMAKE_INSTALL_PREFIX=%P%
   - if %platform%==cygwin set PATH=C:\cygwin\bin;%PATH%
   - if %platform%==cygwin bash -c "autoreconf -i"
   - if %platform%==cygwin bash -c "./configure"
@@ -131,7 +162,7 @@ before_build:
 build_script:
   # build code and unit tests
   - if %platform%==msvc nmake
-  - if %compiler_id%==vs msbuild /p:Platform=%arch% "ALL_BUILD.vcxproj"
+  - if %platform%==vs msbuild /p:Platform=%arch% "ALL_BUILD.vcxproj"
   - if %platform%==cygwin bash -c "make"
   - if %platform%==mingw32 mingw32-make
   - if %platform%==mingw64msys bash -c "make"
@@ -140,7 +171,7 @@ test_script:
   # run unit tests
   - echo Running unit tests...
   - if %platform%==msvc nmake test VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=TRUE
-  - if %compiler_id%==vs ctest --extra-verbose -C Release
+  - if %platform%==vs ctest --extra-verbose -C Release
   - if %platform%==cygwin bash -c "make check"
   - if %platform%==mingw32 tests\check_check.exe
   - if %platform%==mingw64msys bash -c "tests/check_check"