[geos-commits] [SCM] geos branch master updated. efca1e7e754f5a527a0ca7223d674591cc2e271a
git at osgeo.org
git at osgeo.org
Sat Sep 9 15:41:14 PDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".
The branch, master has been updated
via efca1e7e754f5a527a0ca7223d674591cc2e271a (commit)
via 2ebfdcc2e255f446326037652a5edf4f4b3ad430 (commit)
from b7101be6533a1273f715a3309889c23b7ae02e4f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit efca1e7e754f5a527a0ca7223d674591cc2e271a
Author: Mateusz Loskot <mateusz at loskot.net>
Date: Sun Sep 10 00:40:21 2017 +0200
[AppVeyor] Add build jobs with Visual Studio 2017
Currently, AppVeyor builds with VS 2017 and 2015
Part of GEOS RFC 5: C++11 Compilation Mode
diff --git a/appveyor.yml b/appveyor.yml
index 5df4ea4..3e617f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,11 @@
version: 1.0.{build}
-os: Visual Studio 2015
+image: Visual Studio 2017
platform: x64
configuration: Release
-branches:
- only:
- - master
- - svn-3.6
- - svn-3.5
-
shallow_clone: true
clone_depth: 5
@@ -20,21 +14,42 @@ matrix:
environment:
matrix:
+ - PLATFORM: x64
+ BUILDER: CMake
+ GENERATOR: "Visual Studio 15 2017 Win64"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PLATFORM: x86
BUILDER: CMake
- GENERATOR: "Visual Studio 14 2015"
+ GENERATOR: "Visual Studio 15 2017"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PLATFORM: x64
BUILDER: CMake
- GENERATOR: "Visual Studio 14 2015 Win64"
+ GENERATOR: "NMake Makefiles"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PLATFORM: x86
BUILDER: CMake
GENERATOR: "NMake Makefiles"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PLATFORM: x64
BUILDER: CMake
+ GENERATOR: "Visual Studio 14 2015 Win64"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ - PLATFORM: x86
+ BUILDER: CMake
+ GENERATOR: "Visual Studio 14 2015"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ - PLATFORM: x64
+ BUILDER: CMake
+ GENERATOR: "NMake Makefiles"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ - PLATFORM: x86
+ BUILDER: CMake
GENERATOR: "NMake Makefiles"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- PLATFORM: x86
BUILDER: NMake
GENERATOR: "NMake Makefiles"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
init:
- ps: 'Write-Host "Building GEOS branch: $env:APPVEYOR_REPO_BRANCH" -ForegroundColor Magenta'
commit 2ebfdcc2e255f446326037652a5edf4f4b3ad430
Author: Mateusz Loskot <mateusz at loskot.net>
Date: Sun Sep 10 00:34:45 2017 +0200
[Travis] Add build jobs with multiple GCC and clang versions
* GCC 4.8 and 7.x
* clang 3.5 and 3.9
Part of GEOS RFC 5: C++11 Compilation Mode
diff --git a/.travis.yml b/.travis.yml
index 275333a..38cb8f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,33 +6,105 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
#
+dist: trusty
sudo: false
language: cpp
-compiler:
- - g++
- - clang
-
-env:
- - GEOS_BUILD_TOOL=autotools CFLAGS=-m32 CXXFLAGS=-m32
- - GEOS_BUILD_TOOL=autotools CFLAGS=-m64 CXXFLAGS=-m64
- - GEOS_BUILD_TOOL=cmake CFLAGS=-m32 CXXFLAGS=-m32
- - GEOS_BUILD_TOOL=cmake CFLAGS=-m64 CXXFLAGS=-m64
+ref:
+ sources: &sources
+ - ubuntu-toolchain-r-test
+ - george-edison55-precise-backports
matrix:
fast_finish: true
+ include:
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-7','cmake']
+ env:
+ - E="TOOL=cmake && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-7']
+ env:
+ - E="TOOL=autotools && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-7-multilib','gcc-7-multilib','g++-multilib','gcc-multilib']
+ env:
+ - E="TOOL=autotools && CXX=g++-7 && ARCH=-m32 && CC=gcc-7"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-4.8','cmake']
+ env:
+ - E="TOOL=cmake && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-4.8']
+ env:
+ - E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib']
+ env:
+ - E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m32 && CC=gcc-4.8"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['clang-3.9','cmake']
+ env:
+ - E="TOOL=cmake && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['clang-3.9']
+ env:
+ - E="TOOL=autotools && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['clang']
+ env:
+ - E="TOOL=autotools && CXX=clang++ && ARCH=-m64 && CC=clang"
+
+ - os: linux
+ addons:
+ apt:
+ sources: *sources
+ packages: ['clang','cmake']
+ env:
+ - E="TOOL=cmake && CXX=clang++ && ARCH=-m64 && CC=clang"
-addons:
- apt:
- sources:
- - george-edison55-precise-backports
- packages:
- - cmake
- - cmake-data
- - g++-multilib
- - gcc-multilib
- - make
+before_install:
+ - eval "${E}"
+ - export CXXFLAGS=${ARCH}
+ - export CFLAGS=${ARCH}
+ - export GEOS_BUILD_TOOL=${TOOL}
+ - ${CXX} --version
script: ./tools/ci/script.sh
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++----------
appveyor.yml | 33 +++++++++++++-----
2 files changed, 115 insertions(+), 28 deletions(-)
hooks/post-receive
--
geos
More information about the geos-commits
mailing list