From faf92e6ad2c85f11ab9816de59853193a53cf8cc Mon Sep 17 00:00:00 2001
From: tpaviot <tpaviot@gmail.com>
Date: Tue, 15 Nov 2016 13:20:41 +0100
Subject: [PATCH] Updated appeyor build

---
 appveyor-scripts/make-oce-msys.sh | 12 +++++-------
 appveyor.yml                      | 29 +++++------------------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/appveyor-scripts/make-oce-msys.sh b/appveyor-scripts/make-oce-msys.sh
index 152a327630..7856800a9e 100644
--- a/appveyor-scripts/make-oce-msys.sh
+++ b/appveyor-scripts/make-oce-msys.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 set -e
 cd `dirname "$0"`/..
-if [ "$ARCH" = Win32 ]; then
-  PATH=$PATH:/c/MinGW/bin
-elif [ "$ARCH" = i686 ]; then 
+if [ "$ARCH" = i686 ]; then 
   f=i686-4.9.3-release-posix-dwarf-rt_v4-rev1.7z
   if ! [ -e $f ]; then
     echo "Downloading $f"
@@ -13,10 +11,10 @@ elif [ "$ARCH" = i686 ]; then
   echo "Extracting $f"
   mv mingw32 /MinGW
 else
-  f=x86_64-5.2.0-release-posix-seh-rt_v4-rev0.7z
+  f=x86_64-5.4.0-release-posix-seh-rt_v5-rev0.7z
   if ! [ -e $f ]; then
     echo "Downloading $f"
-    curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.2.0/threads-posix/seh/$f
+    curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.4.0/threads-posix/seh/$f
   fi
   echo "Extracting $f"
   7z x $f > /dev/null
@@ -33,12 +31,12 @@ cmake -DOCE_VISUALISATION:BOOL=ON \
       -DOCE_WITH_FREEIMAGE:BOOL=OFF \
       -DOCE_TESTING:BOOL=ON \
       -DOCE_COPY_HEADERS_BUILD:BOOL=ON \
-      -DOCE_INSTALL_PREFIX=C:\\oce-0.17.1-dev \
+      -DOCE_INSTALL_PREFIX=C:\\oce-0.18-dev \
       -G'MSYS Makefiles' ..
 mingw32-make -j4
 mingw32-make install > /dev/null
 #
 # Finally run tests
 #
-export PATH=$PATH:/c/MinGW/bin:/c/oce-0.17.1-dev/$ARCH/bin:/c/MinGW/bin:
+export PATH=$PATH:/c/MinGW/bin:/c/oce-0.18-dev/$ARCH/bin:/c/MinGW/bin:
 mingw32-make test
diff --git a/appveyor.yml b/appveyor.yml
index ad2a78356c..1fc9c9d74d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,14 @@
-version: oce-0.17.1-dev.{build}
+version: oce-0.18-dev.{build}
 
 environment:
-  oce_version: 0.17.1-dev
+  oce_version: 0.18-dev
   matrix:
-    - generator: "MSYS Makefiles"
-      Compiler: MinGW-gcc-4.8.1
-      ARCH: "Win32"
     - generator: "MSYS Makefiles"
       ARCH: "i686"
       Compiler: MinGW-gcc-4.9.3
     - generator: "MSYS Makefiles"
       ARCH: "Win64"
-      Compiler: MinGW64-gcc-5.2.0
+      Compiler: MinGW64-gcc-5.4.0
     - generator: "Visual Studio 12"
       ARCH: "Win32"
       Compiler: "MSVC2013"
@@ -27,11 +24,10 @@ environment:
 
 cache:
   - i686-4.9.3-release-posix-dwarf-rt_v4-rev1.7z
-  - x86_64-5.2.0-release-posix-seh-rt_v4-rev0.7z
+  - x86_64-5.4.0-release-posix-seh-rt_v5-rev0.7z
 
 configuration:
-  #- Debug
-  - RelWithDebInfo
+  - Release
 
 branches:
   only:
@@ -48,7 +44,6 @@ before_build:
 # scripts that run after cloning repository
 install:
   - cmd: CALL FetchBundle.bat
-  #- cmd: git clone -q --branch=master https://github.com/QbProg/oce-win-bundle.git C:\projects\oce-win-bundle
 
 build_script:
   - cmd: if "%generator%" == "MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/oce/appveyor-scripts/make-oce-msys.sh)
@@ -62,17 +57,3 @@ artifacts:
   - path: oce-%oce_version%.%ARCH%.%Compiler%.zip
 
 test: off  # to avoid discovering tests
-
-#
-# The following section automatically uploads artifacts
-# whenever a tag is created on the master branch.
-#
-deploy:
-  - provider: GitHub
-    auth_token:
-      secure: +HE8jHwECbKpIVHeydBVMBskoHh//glZWNo9oCLPvOtLiY3MAO75zPISuwPD/ctW
-    artifact: oce-%oce_version%.%ARCH%.%Compiler%.zip
-    draft: true
-    on:
-      branch: master
-      appveyor_repo_tag: true