From 3a48d26c017781f3a15c52142d54ed88ff00762a Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Sun, 16 Jul 2017 10:50:01 +0900
Subject: [PATCH 1/2] Fix AppVeyor builds

Fix #270.
---
 appveyor.yml       | 1 +
 tools/appveyor.bat | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 76f0181f..f25e514a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
   global:
     AUTH_TOKEN:
       secure: rKd6JLXUIl3vcA8d0S9w14bl+uvUlZLt0d1M8bmlOh+owQqr5c40+/4ITCNBpHG3
+    VIMVER: 80
   matrix:
   - COMPILER: msvc
     CPU: i386
diff --git a/tools/appveyor.bat b/tools/appveyor.bat
index 209ee3d5..60940c6d 100755
--- a/tools/appveyor.bat
+++ b/tools/appveyor.bat
@@ -27,7 +27,7 @@ nmake -f make_msvc.mak nodebug=1 CPU=%CPU%
 goto :eof
 
 :msvc_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis
 
@@ -47,7 +47,7 @@ make -f make_mingw32.mak
 goto :eof
 
 :mingw_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis
 
@@ -72,7 +72,7 @@ bash -lc "make"
 goto :eof
 
 :msys2_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis
 

From ba6e492e32a153dbf99b101f8db3a7f8598bdde8 Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Sun, 16 Jul 2017 10:59:03 +0900
Subject: [PATCH 2/2] appveyor: Replace MinGW with MSYS2 MinGW 32-bit

MinGW fails with unknown reasons:
https://ci.appveyor.com/project/Shougo/vimproc-vim/build/103/job/iqcpbgo6kf1y7sl7
The output of themis looks okay, but the exit code is not 0.

Stop using old MinGW and replace it MSYS2 MinGW 32-bit.
---
 appveyor.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f25e514a..37ec979c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,12 @@ environment:
     ENV: /x64
     BIT: 64
   - COMPILER: cygwin
-  - COMPILER: mingw
+  #- COMPILER: mingw
+  #  BIT: 32
+  - COMPILER: msys2
+    MSYS2_ARCH: i686
+    MSYS2_DIR: msys64
+    MSYSTEM: MINGW32
     BIT: 32
   - COMPILER: msys2
     MSYS2_ARCH: x86_64