diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-02-24 11:12:37 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-02-24 11:55:26 +0100 |
| commit | 516641cfb6a1797991da1ad10fc40096cf7413ab (patch) | |
| tree | a81353168b31d8a3c610b6c6b39d9b518b4a5890 | |
| parent | 70158c3302f087e6ddd71cf8414e5436b44bc71b (diff) | |
| download | PROJ-516641cfb6a1797991da1ad10fc40096cf7413ab.tar.gz PROJ-516641cfb6a1797991da1ad10fc40096cf7413ab.zip | |
.travis.yml: add build with g++-7 and -D_GLIBCXX_ASSERTIONS (refs #1290)
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rwxr-xr-x | travis/install.sh | 2 | ||||
| -rwxr-xr-x | travis/linux_gcc7/after_success.sh | 5 | ||||
| -rwxr-xr-x | travis/linux_gcc7/before_install.sh | 20 | ||||
| -rwxr-xr-x | travis/linux_gcc7/install.sh | 7 |
5 files changed, 53 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 137e9afb..bc7e685f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,24 @@ matrix: env: - BUILD_NAME=linux_gcc - DETAILS="linux, gcc" + + - os: linux + dist: trusty + sudo: required + services: + - docker + env: + - BUILD_NAME=linux_gcc7 + - DETAILS="linux, gcc7" + - CC=gcc-7 + - CXX=g++-7 + - CXXFLAGS='-g -D_GLIBCXX_ASSERTIONS' + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: ['g++-7','make','autoconf','automake'] + - os: linux dist: trusty compiler: clang @@ -29,11 +47,13 @@ matrix: env: - BUILD_NAME=linux_clang - DETAILS="linux, clang" + - os: osx language: cpp env: - BUILD_NAME=osx - DETAILS="osx" + - os: linux dist: trusty compiler: gcc diff --git a/travis/install.sh b/travis/install.sh index 2013a610..f5fa7d08 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -23,7 +23,7 @@ cd $TAR_DIRECTORY mkdir build_autoconf cd build_autoconf if [ -f /usr/lib/jvm/java-7-openjdk-amd64/include/jni.h ]; then - CXXFLAGS="-I/usr/lib/jvm/java-7-openjdk-amd64/include -I/usr/lib/jvm/java-7-openjdk-amd64/include/linux" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni + CXXFLAGS="-I/usr/lib/jvm/java-7-openjdk-amd64/include -I/usr/lib/jvm/java-7-openjdk-amd64/include/linux $CXXFLAGS" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni else ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all fi diff --git a/travis/linux_gcc7/after_success.sh b/travis/linux_gcc7/after_success.sh new file mode 100755 index 00000000..70c6f5cb --- /dev/null +++ b/travis/linux_gcc7/after_success.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -e + +#./travis/after_success.sh diff --git a/travis/linux_gcc7/before_install.sh b/travis/linux_gcc7/before_install.sh new file mode 100755 index 00000000..25c7483f --- /dev/null +++ b/travis/linux_gcc7/before_install.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +./travis/before_install.sh + +sudo apt-get update -qq +sudo apt-get install -y cppcheck +sudo apt-get install -qq lcov +sudo apt-get install -qq doxygen graphviz +sudo apt-get install -qq sqlite3 libsqlite3-dev +sudo apt-get install -qq openjdk-7-jdk + +#scripts/cppcheck.sh +#scripts/doxygen.sh + +#pip install --user sphinxcontrib-bibtex +#pip install --user cpp-coveralls + +#./travis/docker.sh diff --git a/travis/linux_gcc7/install.sh b/travis/linux_gcc7/install.sh new file mode 100755 index 00000000..b957b927 --- /dev/null +++ b/travis/linux_gcc7/install.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +export CCACHE_CPP2=yes + +CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c89 -Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh |
