diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-02-24 12:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-24 12:45:17 +0100 |
| commit | 36a43f88aa2a136ddb1b901cff469e6e0d9e75d7 (patch) | |
| tree | c2d5f3ebeab346fd01fd56a1608887cd9c833d9a /travis | |
| parent | 70158c3302f087e6ddd71cf8414e5436b44bc71b (diff) | |
| parent | 22a786693f66c815220861f15fd041584d32a1f1 (diff) | |
| download | PROJ-36a43f88aa2a136ddb1b901cff469e6e0d9e75d7.tar.gz PROJ-36a43f88aa2a136ddb1b901cff469e6e0d9e75d7.zip | |
Merge pull request #1291 from rouault/fix_GLIBCXX_ASSERTIONS
Fix -D_GLIBCXX_ASSERTIONS (refs #1290)
Diffstat (limited to 'travis')
| -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 |
4 files changed, 33 insertions, 1 deletions
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 |