[geos-commits] r4372 - branches/3.6

[Mateusz Loskot]

Author: mloskot
Date: 2017-03-26 15:34:14 -0700 (Sun, 26 Mar 2017)
New Revision: 4372

Modified:
   branches/3.6/
   branches/3.6/appveyor.yml
Log:
Merged revision(s) 4343, 4347-4349, 4351-4355, 4358, 4360, 4362, 4365 from trunk:
AppVeyor: Sync CI builds configuration with trunk


Property changes on: branches/3.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.4:4056
/branches/3.5:4210
/trunk:4340
   + /branches/3.4:4056
/branches/3.5:4210
/trunk:4340,4343,4347-4349,4351-4355,4358,4360,4362,4365

Modified: branches/3.6/appveyor.yml
===================================================================
--- branches/3.6/appveyor.yml	2017-03-26 21:31:09 UTC (rev 4371)
+++ branches/3.6/appveyor.yml	2017-03-26 22:34:14 UTC (rev 4372)
@@ -21,13 +21,20 @@
 environment:
   matrix:
     - PLATFORM: x86
+      BUILDER: CMake
       GENERATOR: "Visual Studio 14 2015"
     - PLATFORM: x64
+      BUILDER: CMake
       GENERATOR: "Visual Studio 14 2015 Win64"
     - PLATFORM: x86
+      BUILDER: CMake
       GENERATOR: "NMake Makefiles"
     - PLATFORM: x64
+      BUILDER: CMake
       GENERATOR: "NMake Makefiles"
+    - PLATFORM: x86
+      BUILDER: NMake
+      GENERATOR: "NMake Makefiles"
 
 init:
   - ps: 'Write-Host "Building GEOS branch: $env:APPVEYOR_REPO_BRANCH" -ForegroundColor Magenta'
@@ -39,16 +46,19 @@
   - if "%GENERATOR%"=="NMake Makefiles" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
 
 before_build:
-  - ps: 'Write-Host "Running cmake: $env:GENERATOR" -ForegroundColor Magenta'
-  - cmake.exe -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER%
+  - ps: 'Write-Host "Running $env:BUILDER with $env:GENERATOR" -ForegroundColor Magenta'
+  - if "%BUILDER%"=="CMake" cmake.exe -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER%
+  - if "%BUILDER%"=="NMake" .\autogen.bat
 
 build_script:
-  - ps: 'Write-Host "Running cmake --build:" -ForegroundColor Magenta'
-  - cmake --build . --config %CONFIGURATION%
+  - ps: 'Write-Host "Running $env:BUILDER:" -ForegroundColor Magenta'
+  - if "%BUILDER%"=="CMake" cmake --build . --config %CONFIGURATION%
+  - if "%BUILDER%"=="NMake" nmake /f makefile.vc
 
 test_script:
-  - ps: 'Write-Host "Running CTest:" -ForegroundColor Magenta'
-  - ctest -V --output-on-failure -C %CONFIGURATION%
+  - ps: 'Write-Host "Running tests:" -ForegroundColor Magenta'
+  - if "%BUILDER%"=="CMake" ctest -V --output-on-failure -C %CONFIGURATION%
+  - if "%BUILDER%"=="NMake" echo *** NMake does NOT build tests ***
 
 # If you need to debug AppVeyor session (https://www.appveyor.com/docs/how-to/rdp-to-build-worker), then:
 # 1. Uncomment the on_finish section below: