From d8df98314a4aa4c7be5bfcf580e27563fc9fc8ff Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 25 Mar 2017 13:20:15 +0500
Subject: [PATCH] Several AppVeyor improvements:

* added very important "-g" switch to cygwin setup command, which means "update cygwin itself", without it package manipulation is not predictable
* moved everything to appveyor.yml
* renamed appveyor.yml to .appveyor.yml
---
 .appveyor.yml | 22 ++++++++++++++++++++++
 appveyor.sh   | 19 -------------------
 appveyor.yml  | 18 ------------------
 3 files changed, 22 insertions(+), 37 deletions(-)
 create mode 100644 .appveyor.yml
 delete mode 100755 appveyor.sh
 delete mode 100644 appveyor.yml

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..dfbcd8a
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,22 @@
+version: "cygwin-{build}"
+
+environment:
+  matrix:
+    - ARCH: x86
+      CYGWIN: C:\Cygwin
+      CHOST: i686-w64-mingw32
+      CC: i686-w64-mingw32-gcc
+    - ARCH: x86_64
+      CYGWIN: C:\Cygwin64
+      CHOST: x86_64-w64-mingw32
+      CC: x86_64-w64-mingw32-gcc
+
+build_script:
+  - "%CYGWIN%\\setup-%ARCH%.exe -g -q -P mingw64-i686-openssl,mingw64-x86_64-openssl,cygwin-devel"
+  - "%CYGWIN%\\bin\\bash -lc 'set -eux; cd /cygdrive/c/projects/%APPVEYOR_PROJECT_NAME%; autoreconf -iv; ./configure --prefix=/ --libdir=/lib --host=$CHOST --build=i686-pc-cygwin --program-prefix=\'\'; make'"
+
+artifacts:
+  - path: openvpn-gui.exe
+
+on_failure:
+  - cmd: appveyor PushArtifact config.log
diff --git a/appveyor.sh b/appveyor.sh
deleted file mode 100755
index d232fad..0000000
--- a/appveyor.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-autoreconf -iv
-unset CC
-unset CXX
-
-if [ "${ARCH}" = "x86" ]; then 
-	export ABBR="i686" 
-	export CHOST="i686-w64-mingw32"
-fi
-
-if [ "${ARCH}" = "x86_64" ]; then 
-        export ABBR="x86_64"
-	export CHOST="x86_64-w64-mingw32"
-fi
-
-export CC=${ABBR}-w64-mingw32-gcc
-
-./configure --prefix=/ --libdir=/lib --host=$CHOST --build=i686-pc-cygwin --program-prefix=''
-make
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 97f5407..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "cygwin-{build}"
-
-environment:
-  matrix:
-    - ARCH: x86
-      CYGWIN: C:\Cygwin
-    - ARCH: x86_64
-      CYGWIN: C:\Cygwin64
-
-build_script:
-  - "%CYGWIN%\\setup-%ARCH%.exe -q -P mingw64-i686-openssl,mingw64-x86_64-openssl,cygwin-devel"
-  - "%CYGWIN%\\bin\\bash -lc 'cd /cygdrive/c/projects/%APPVEYOR_PROJECT_NAME% ; ./appveyor.sh'"
-
-artifacts:
-  - path: openvpn-gui.exe
-
-on_failure:
-  - cmd: appveyor PushArtifact config.log