From e04123af511f7e83659e4bf9fdd711e3455b398f Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Sat, 3 Mar 2018 20:06:47 +0100
Subject: [PATCH] add build tests to appveyor

---
 .appveyor-vcpkg.yml | 36 ++++++++++++++++++++++++++++++++----
 .appveyor.yml       | 22 ++++++++++++++++------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/.appveyor-vcpkg.yml b/.appveyor-vcpkg.yml
index c4672935..6ec5570e 100644
--- a/.appveyor-vcpkg.yml
+++ b/.appveyor-vcpkg.yml
@@ -1,7 +1,9 @@
-os:
+image:
   - Visual Studio 2015
+  - Visual Studio 2017
 
 build:
+  parallel: true
   verbosity: detailed
 
 configuration:
@@ -13,21 +15,47 @@ environment:
 
   matrix:
       - platform: x86
-        generator: Visual Studio 14 2015
+        CMAKE_FLAGS: 
+        
+      - platform: x86
+        CMAKE_FLAGS: -Denable-network=0
+
+      - platform: x86
+        CMAKE_FLAGS: -DBUILD_SHARED_LIBS=0
 
       - platform: x64
-        generator: Visual Studio 14 2015 Win64
+        CMAKE_FLAGS: 
+
+      - platform: x64
+        CMAKE_FLAGS: -Denable-network=0
+
+      - platform: x64
+        CMAKE_FLAGS: -DBUILD_SHARED_LIBS=0
+
+#      - platform: ARM ## currently fails to build pcre:arm-windows
 
 cache:
   - c:\Tools\vcpkg\installed
 
+init:
+  - set TARGET_PLATFORM=
+  - if "%platform%"=="x64" ( set TARGET_PLATFORM= Win64)
+  - if "%platform%"=="ARM" ( set TARGET_PLATFORM= ARM)
+  - echo %TARGET_PLATFORM%
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set "generator=Visual Studio 15 2017%TARGET_PLATFORM%" )
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set "generator=Visual Studio 14 2015%TARGET_PLATFORM%" )
+  - echo %generator%
+  
 install:
+# make sure the latest version of git is installed
+  - choco upgrade git -y
   - vcpkg install glib:%platform%-windows
 
 build_script:
   - mkdir build
   - cd build
-  - cmake -G "%generator%" -Denable-pkgconfig=0 -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+  - cmake -G "%generator%" %CMAKE_FLAGS% -Denable-pkgconfig=0 -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - cmake --build . --config Release
 
 after_build:
diff --git a/.appveyor.yml b/.appveyor.yml
index b00b3372..9dc5fcdf 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,16 +1,17 @@
-os:
+image:
   - Visual Studio 2015
+  - Visual Studio 2017
 
 build:
+  parallel: true
   verbosity: detailed
 
 configuration:
   - Release
-  
+
 environment:
   matrix:
     - platform: x86
-      generator: Visual Studio 14 2015
       glib-url: http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip
       glib-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib-dev_2.28.8-1_win32.zip
       pkg-config-url: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip
@@ -18,15 +19,24 @@ environment:
       proxy-libintl-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/proxy-libintl-dev_20100902_win32.zip
 
     - platform: x64
-      generator: Visual Studio 14 2015 Win64
       glib-url: http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.1-1_win64.zip
       glib-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib-dev_2.26.1-1_win64.zip
       pkg-config-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip
       gettext-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip
       proxy-libintl-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/proxy-libintl-dev_20100902_win64.zip
       
-  
+init:
+  - set TARGET_PLATFORM=
+  - if "%platform%"=="x64" ( set TARGET_PLATFORM= Win64)
+  - echo %TARGET_PLATFORM%
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set "generator=Visual Studio 15 2017%TARGET_PLATFORM%" )
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set "generator=Visual Studio 14 2015%TARGET_PLATFORM%" )
+  - echo %generator%
+
 install:
+# make sure the latest version of git is installed
+  - choco upgrade git -y
   - mkdir c:\deps
   - cd c:\deps
   - curl -fsS -o glib.zip %glib-url%
@@ -49,7 +59,7 @@ build_script:
   - cd build
   - cmake -G "%generator%" ..
   - cmake --build . --config Release
-  
+
 after_build:
   - 7z a fluidsynth.zip %APPVEYOR_BUILD_FOLDER%\build\src\Release\* c:\deps\bin\libglib*.dll c:\deps\bin\libgthread*.dll c:\deps\bin\*intl*.dll