From 6a4ac22ca070815e8297a9063b0b90699e333a40 Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <raf-ep@gmx.com>
Date: Thu, 18 Feb 2016 01:01:41 +0000
Subject: [PATCH] Appveyor: Cleanup settings, add Qt 5.5/Mingw build

- Cleanup old settings in Appveyor that are no longer used since the
Nuget packages were removed.
- Bump Qt version to 5.5.
- Add MinGW builds.
---
 contrib/appveyor-mingw.bat |  9 +++++++++
 contrib/appveyor-msvc.bat  |  7 +++++++
 contrib/appveyor.yml       | 34 ++++++++--------------------------
 3 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 contrib/appveyor-mingw.bat
 create mode 100644 contrib/appveyor-msvc.bat

diff --git a/contrib/appveyor-mingw.bat b/contrib/appveyor-mingw.bat
new file mode 100644
index 000000000..ad3e7fd12
--- /dev/null
+++ b/contrib/appveyor-mingw.bat
@@ -0,0 +1,9 @@
+rem CMake/MinGW workaround - remove sh.exe from PATH
+where sh
+set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+set CMAKE_PREFIX_PATH=%QTDIR%
+set PATH=%MINGW%\bin;%PATH%;%QTDIR%\bin
+mkdir build
+cd build
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=../INSTALL ..
+cmake --build . --target windeployqt
diff --git a/contrib/appveyor-msvc.bat b/contrib/appveyor-msvc.bat
new file mode 100644
index 000000000..ec57d87b7
--- /dev/null
+++ b/contrib/appveyor-msvc.bat
@@ -0,0 +1,7 @@
+set CMAKE_PREFIX_PATH=%QTDIR%
+set PATH=%PATH%;%QTDIR%\bin
+mkdir build
+cd build
+rem FYI CMAKE_BUILD_TYPE does not work with VS generators, use --config
+cmake -G "Visual Studio 12" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=../INSTALL ..
+cmake --build . --config %configuration% --target windeployqt
diff --git a/contrib/appveyor.yml b/contrib/appveyor.yml
index f976a8f92..950ed272b 100644
--- a/contrib/appveyor.yml
+++ b/contrib/appveyor.yml
@@ -3,41 +3,23 @@ skip_tags: false
 os: MinGW
 shallow_clone: true
 environment:
-  VCINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\
   matrix:
-  - CMAKE_GENERATOR: Visual Studio 12
-    QTDIR: C:/Qt/5.4/msvc2013_opengl
+  - CMAKE_GENERATOR: MinGW Makefiles
+    QTDIR: C:\Qt\5.5\mingw492_32
+    MINGW: C:\Qt\Tools\mingw492_32
+    SCRIPT: contrib\appveyor-mingw.bat
+  - VCINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\
+    QTDIR: C:\Qt\5.5\msvc2013
+    SCRIPT: contrib\appveyor-msvc.bat
 configuration:
 - RelWithDebInfo
 matrix:
   fast_finish: true
 build_script:
-- set SEMVER=0.0.0
-# Build packages as 0.1.2-ci{build}
-- set PKG_VERSION=%SEMVER%-ci%APPVEYOR_BUILD_NUMBER%
-# Build packages for tags as 0.1.2-TAGNAME
-- if DEFINED APPVEYOR_REPO_TAG_NAME set PKG_VERSION=%SEMVER%-%APPVEYOR_REPO_TAG_NAME%
-- echo %PKG_VERSION%
-- set CMAKE_PREFIX_PATH=%QTDIR%
-- set PATH=%PATH%;%QTDIR%/bin
-# Build Msgpack
-- mkdir build-third-party
-- cd build-third-party
-  # FYI CMAKE_BUILD_TYPE does not work with VS generators, use --config
-- cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=../INSTALL ../third-party
-- cmake --build . --config %configuration% --target install
-- cd ..
-# Build nvim-qt
-- mkdir build
-- cd build
-- cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=../INSTALL ..
-# FYI CMAKE_BUILD_TYPE does not work with VS generators, use --config
-- cmake --build . --config %configuration% --target windeployqt
+- cmd: '%SCRIPT%'
 artifacts:
 - path: build/bin
   name: neovim-qt
-- path: 'build/*.nupkg'
-  name: nupkgs
 deploy:
   - provider: GitHub
     description: Automated builds (Appveyor)