THRIFT-4508: change windows CI builds to use current MSVC, one cygwin and one mingw build
diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat
index 0d5f99e..ce8fc7d 100644
--- a/build/appveyor/MING-appveyor-install.bat
+++ b/build/appveyor/MING-appveyor-install.bat
@@ -13,9 +13,43 @@
::
::
-:: Appveyor install script for MinGW
-:: Installs (or builds) third party packages we need
+:: Appveyor install script for MINGW on MSYS2
+:: Installs third party packages we need for a cmake build
::
-:: Same as the MSYS installation requirements
-CALL build\appveyor\MSYS-appveyor-install.bat
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+
+CD build\appveyor || EXIT /B
+CALL cl_banner_install.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+CALL cl_showenv.bat || EXIT /B
+
+:: We're going to keep boost at a version cmake understands
+SET BOOSTVER=1.64.0-3
+SET BOOSTPKG=mingw-w64-%MINGWPLAT%-boost-%BOOSTVER%-any.pkg.tar.xz
+SET IGNORE=--ignore mingw-w64-x86_64-boost --ignore mingw-w64-i686-boost
+
+SET PACKAGES=^
+ --needed -S bison flex make ^
+ mingw-w64-%MINGWPLAT%-cmake ^
+ mingw-w64-%MINGWPLAT%-libevent ^
+ mingw-w64-%MINGWPLAT%-openssl ^
+ mingw-w64-%MINGWPLAT%-toolchain ^
+ mingw-w64-%MINGWPLAT%-zlib
+
+::mingw-w64-%MINGWPLAT%-qt5 : WAY too large (1GB download!) - tested in cygwin builds anyway
+
+:: Remove old packages that no longer exist to avoid an error
+%BASH% -lc "pacman --noconfirm --remove libcatgets catgets || true" || EXIT /B
+
+:: Upgrade things
+%BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B
+%BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B
+%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B
+
+:: Install a slightly older boost (BOOSTVER) as cmake in mingw
+:: does not have built-in dependencies for boost 1.66.0 yet
+:: -- this cuts down on build warning output --
+
+%BASH% -lc "if [[ $(pacman --query | grep '%MINGWPLAT%-boost') ^!= *"%BOOSTVER%"* ]]; then wget http://repo.msys2.org/mingw/%MINGWPLAT%/%BOOSTPKG% && pacman --noconfirm --needed -U %BOOSTPKG% && rm %BOOSTPKG%; fi" || EXIT /B