From e832f57bbd0a8017a060a004b97b5d262857212d Mon Sep 17 00:00:00 2001
From: Paul I <pelijah@users.noreply.github.com>
Date: Thu, 14 Feb 2019 21:42:52 +0300
Subject: [PATCH] AppVeyor: switch to VS2017, Qt 5.12 and disable x86 build
 (#1184)

---
 .appveyor.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fbd7490a..d0fd75b4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: '1.7.4-git-{build}'
-image: 'Visual Studio 2015'
+image: 'Visual Studio 2017'
 clone_depth: 1
 
 # Build configuration
@@ -9,16 +9,16 @@ configuration:
 # Environment
 environment:
   NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
-  QT32PATH: 'C:\Qt\5.10.1\msvc2015'
-  QT64PATH: 'C:\Qt\5.10.1\msvc2015_64'
-  VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'
+  QT32PATH: 'C:\Qt\5.12\msvc2017'
+  QT64PATH: 'C:\Qt\5.12\msvc2017_64'
+  VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat'
   matrix:
-    # Build: qmake vs2015 x86 shared
-    - ARCH: x86
-      PYTHON: 'C:\Python36'
-      QMAKE: 1
-      DEPLOY: true
-    # Build: qmake vs2015 x64 shared
+    # Build: qmake vs2017 x86 shared
+    #- ARCH: x86
+    #  PYTHON: 'C:\Python36'
+    #  QMAKE: 1
+    #  DEPLOY: true
+    # Build: qmake vs2017 x64 shared
     - ARCH: x64
       PYTHON: 'C:\Python36-x64'
       QMAKE: 1
@@ -31,10 +31,11 @@ environment:
       DEPLOY: false
 
 install:
+  - ps: $env:path = ($env:path -split ";").Where({!($_ -like "*Microsoft SQL Server*")}) -join ";"
   - cmd: set "PATH=%CD%;%PYTHON%;%PATH%"
   - cmd: call "%VSVARSALLPATH%" %ARCH%
   - cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" )
-  - cmd: python -m pip install meson==0.48.2
+  - cmd: python -m pip install meson
   - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ."
   # Artifacts
   - cmd: set "ARTIFACT_NAME=Cutter-v1.7.4-%ARCH%.Windows"
@@ -47,7 +48,7 @@ before_build:
 # Build config
 build_script:
   - cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_APPVEYOR_R2DEC=true )
-  - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter --webengine )
+  - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter )
 
 after_build:
   - cmd: if defined QMAKE ( set "PATH=%CD%\r2_dist_%ARCH%;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" )