AppVeyor: Add MSYS2 and Cygwin

appveyor.yml

@@ -1,10 +1,16 @@
 version: 1.0.{build}
 
 environment:
+  global:
+    MSYS2_BASEVER: 20150512
+
   matrix:
-  - compiler: msbuild
-  - compiler: msvc
-  - compiler: mingw
+    - compiler: msbuild
+    - compiler: msvc
+    - compiler: mingw
+    - compiler: msys2
+      MSYS2_ARCH: x86_64
+    - compiler: cygwin
 
 build_script:
   - 'win32\appveyor.bat'

win32/appveyor.bat

@@ -4,6 +4,8 @@
 if %compiler%==msbuild goto msbuild
 if %compiler%==msvc goto msvc
 if %compiler%==mingw goto mingw
+if %compiler%==msys2 goto msys2
+if %compiler%==cygwin goto cygwin
 exit 1
 
 :msbuild
@@ -49,18 +51,43 @@ goto :eof
 
 
 :mingw
-:: Using MinGW
+:: Using MinGW without autotools
 path C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%path%
 @echo on
+make -f mk_mingw.mak
+ctags --version
+
+@echo off
+goto :eof
+
+
+:msys2
+:: Using MSYS2
+@echo on
+appveyor DownloadFile "http://kent.dl.sourceforge.net/project/msys2/Base/%MSYS2_ARCH%/msys2-base-%MSYS2_ARCH%-%MSYS2_BASEVER%.tar.xz" -FileName "msys2.tar.xz"
+c:\cygwin\bin\xz -dc msys2.tar.xz | c:\cygwin\bin\tar xf -
+set CHERE_INVOKING=yes
+msys64\usr\bin\bash -lc ""
+msys64\usr\bin\bash -lc "for i in {1..3}; do pacman --noconfirm -Suy mingw-w64-%MSYS2_ARCH%-toolchain base-devel && break || sleep 15; done"
+msys64\usr\bin\bash -lc "autoreconf -vfi"
 :: sh -c "autoreconf -vfi"
 :: sh ./configure
 :: make
 :: ctags --version
 :: make check
 
-:: autoreconf doesn't seem to work on AppVeyor. Use mk_mingw.mak instead.
-make -f mk_mingw.mak
-ctags --version
+@echo off
+goto :eof
+
+
+:cygwin
+:: Using Cygwin
+@echo on
+set CHERE_INVOKING=yes
+c:\cygwin\bin\bash -lc ""
+c:\cygwin\bin\bash -lc "autoreconf -vfi"
+c:\cygwin\bin\bash -lc "./configure"
+c:\cygwin\bin\bash -lc "make && make check"
 
 @echo off
 goto :eof