Appeyor: added msbuild, disabled MSYS2 and Cygwin.

Added msbuild to build matrix. Because MSYS2 and Cygwin don't have a proper build yet and they both take long to execute, they are disabled for now.

diff --git a/appveyor.yml b/appveyor.yml
index ee2ab994c4479e5cbe85d3b1008ab0644f4e97de..24c3a423021a5cfaa22117a2676961e96c83538c 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,43 +1,54 @@
 version: 2.38.{build}
 
+image: Visual Studio 2015
+
 environment:
   # Required so bash starts in the same folder as from where it was called.
   CHERE_INVOKING: 1
   matrix:
-    - compiler: msys2
-    - compiler: cygwin
+    - compiler: msbuild
+    #- compiler: msys2
+    #- compiler: cygwin
 
 install:
-  - cinst ghostscript
+  # Only has to be installed when MSYS2 or Cygwin are enabled.
+  #- cinst ghostscript
 
 build_script:
-  # Add Ghostscript folder to the path so ps2pdf can be called to create docs.
-  # When executing ps2pdf, 'gs' gets called. On Windows the program is required program is called gswin64c.exe,
-  # so we create a symlink called 'gs' that points to gswin64c.
-  - SET PATH="%PATH%;C:\Program Files\gs\gs9.19\lib;C:\Program Files\gs\gs9.19\bin;"
-  - mklink "C:\Program Files\gs\gs9.19\bin\gs" "C:\Program Files\gs\gs9.19\bin\gswin64c.exe"
+  # Ghostscript only has to be configured when MSYS2 or Cygwin are enabled.
+  ## Add Ghostscript folder to the path so ps2pdf can be called to create docs.
+  ## When executing ps2pdf, 'gs' gets called. On Windows the program is required program is called gswin64c.exe,
+  ## so we create a symlink called 'gs' that points to gswin64c.
+  ##- SET PATH="%PATH%;C:\Program Files\gs\gs9.19\lib;C:\Program Files\gs\gs9.19\bin;"
+  ##- mklink "C:\Program Files\gs\gs9.19\bin\gs" "C:\Program Files\gs\gs9.19\bin\gswin64c.exe"
   - ps: >-
       cd $env:APPVEYOR_BUILD_FOLDER 
 
-      $BashPath = ""
-
-      if ($env:compiler -eq "msys2") {
-        $BashPath = "C:\msys64\usr\bin\bash"
-        & $BashPath -lc "pacman -S --noconfirm autoconf-archive mingw-w64-x86_64-cairo mingw-w64-x86_64-freetype mingw-w64-x86_64-fontconfig mingw-w64-x86_64-libpng mingw-w64-x86_64-pango"
+      if($env:compiler -eq "msbuild") {
+        msbuild /p:Configuration=Release
       }
+      
+      if ($env:compiler -eq "msys2" -Or $env:compiler -eq "cygwin") {
+        $BashPath = ""
 
-      if ($env:compiler -eq "cygwin") {
-        C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -s http://cygwin.mirror.constant.com -l C:/cygwin64/var/cache/setup -P autoconf-archive -P flex -P swig -P mingw64-x86_64-cairo -P expat -P mingw64-x86_64-freetype -P mingw64-x86_64-fontconfig -P mingw64-x86_64-glib2.0 -P mingw64-x86_64-libpng -P mingw64-x86_64-pango -P zlib -P mingw64-x86_64-libpng
-        $BashPath = "C:\cygwin64\bin\bash"
-        # For some reason Cygwin ignores CHERE_INVOKING=1 for the first bash command.
-        # Executing some arbitrary command solves this. So without this next line, the build will fail.
-        & $BashPath -lc "ls"
-      }
+        if ($env:compiler -eq "msys2") {
+          $BashPath = "C:\msys64\usr\bin\bash"
+          & $BashPath -lc "pacman -S --noconfirm autoconf-archive mingw-w64-x86_64-cairo mingw-w64-x86_64-freetype mingw-w64-x86_64-fontconfig mingw-w64-x86_64-libpng mingw-w64-x86_64-pango"
+        }
 
-      Write-Output "Execute ./autogen.sh, which also executes ./configure"
+        if ($env:compiler -eq "cygwin") {
+          C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -s http://cygwin.mirror.constant.com -l C:/cygwin64/var/cache/setup -P autoconf-archive -P flex -P swig -P mingw64-x86_64-cairo -P expat -P mingw64-x86_64-freetype -P mingw64-x86_64-fontconfig -P mingw64-x86_64-glib2.0 -P mingw64-x86_64-libpng -P mingw64-x86_64-pango -P zlib -P mingw64-x86_64-libpng
+          $BashPath = "C:\cygwin64\bin\bash"
+          # For some reason Cygwin ignores CHERE_INVOKING=1 for the first bash command.
+          # Executing some arbitrary command solves this. So without this next line, the build will fail.
+          & $BashPath -lc "ls"
+        }
 
-      & $BashPath -lc "./autogen.sh"
-      
-      Write-Output "Execute make"
+        Write-Output "Execute ./autogen.sh, which also executes ./configure"
+
+        & $BashPath -lc "./autogen.sh"
+        
+        Write-Output "Execute make"
 
-      & $BashPath -lc "make"
+        & $BashPath -lc "make"
+      }