From eb380bb6368848b454caef00425845416da5959c Mon Sep 17 00:00:00 2001
From: bergwerkgis <wb@bergwerk-gis.at>
Date: Mon, 21 Sep 2015 14:04:28 +0200
Subject: [PATCH] [wip] enable AppVeyor

---
 appveyor.yml               |  1 +
 scripts/build-appveyor.bat | 30 +++++++++++++++++-------------
 scripts/build-local.bat    |  1 +
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index eeffd3484..622c9d0a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,7 @@
 environment:
   msvs_toolset: 14
   BOOST_VERSION: 58
+  FASTBUILD: 1
   matrix:
     - platform: x64
       configuration: Release
diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat
index d1fe4266a..6cbea83a5 100644
--- a/scripts/build-appveyor.bat
+++ b/scripts/build-appveyor.bat
@@ -7,6 +7,18 @@ ECHO =========== %~f0 ===========
 SET PATH=C:\Python27;%PATH%
 SET PATH=C:\Program Files\7-Zip;%PATH%
 
+::cloning mapnik-gyp
+if EXIST mapnik-gyp ECHO mapnik-gyp already cloned && GOTO MAPNIK_GYP_ALREADY_HERE
+CALL git clone https://github.com/mapnik/mapnik-gyp.git
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+:MAPNIK_GYP_ALREADY_HERE
+CD mapnik-gyp
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+git pull
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+
+::cloning gyp
 if EXIST gyp ECHO gyp already cloned && GOTO GYP_ALREADY_HERE
 CALL git clone https://chromium.googlesource.com/external/gyp.git gyp
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
@@ -14,6 +26,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CD gyp
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 git pull
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CD ..
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
@@ -25,20 +38,11 @@ ECHO extracting binary deps
 IF EXIST mapnik-sdk (ECHO already extracted) ELSE (7z -y x deps.7z | %windir%\system32\FIND "ing archive")
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-SET MAPNIK_SDK=%APPVEYOR_BUILD_FOLDER%\mapnik-sdk
-
-ECHO generating solution file, calling gyp...
-CALL gyp\gyp.bat mapnik.gyp --depth=. ^
- --debug=all ^
- -Dincludes=%MAPNIK_SDK%/include ^
- -Dlibs=%MAPNIK_SDK%/lib ^
- -Dconfiguration=%configuration% ^
- -Dplatform=%platform% ^
- -Dboost_version=1_%BOOST_VERSION% ^
- -f msvs -G msvs_version=2015 ^
- --generator-output=build
-IF %ERRORLEVEL% NEQ 0 (ECHO error during solution file generation && GOTO ERROR) ELSE (ECHO solution file generated)
+CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+ECHO calling build.bat of mapnik-gyp && CALL build.bat
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 GOTO DONE
 
diff --git a/scripts/build-local.bat b/scripts/build-local.bat
index 6a2961d70..908161f67 100644
--- a/scripts/build-local.bat
+++ b/scripts/build-local.bat
@@ -6,6 +6,7 @@ ECHO =========== %~f0 ===========
 
 SET MAPNIK_GIT=3.0.5
 SET BOOST_VERSION=58
+SET FASTBUILD=1
 SET msvs_toolset=14
 SET platform=x64
 SET APPVEYOR_BUILD_FOLDER=%CD%