diff options
| author | Mike Taves <mwtoews@gmail.com> | 2019-09-25 11:47:40 +1200 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2019-09-25 20:50:07 +1200 |
| commit | 4013aeaaf7796cfff6b97668870ce4a2af3d509a (patch) | |
| tree | 3d19245a8df8c4f102d28c4b19a1065d81957b8f /travis/install.sh | |
| parent | 14828d9695ab54272fee0dab35a489180c20f2ea (diff) | |
| download | PROJ-4013aeaaf7796cfff6b97668870ce4a2af3d509a.tar.gz PROJ-4013aeaaf7796cfff6b97668870ce4a2af3d509a.zip | |
Upgrade testing from trusty to xenial, and also:
* From openjdk-7 via apt to openjdk-11 via Travis CI xenial's $JAVA_HOME
* From mingw 4.8 -> 5.3, as supported by xenial
* clang+llvm for csa kept at version 6.0.0, but for ubuntu-16.04
* Furthermore xenial implicitly has many upgrades, specifically:
- gcc 4.8.4 -> 5.4.0
- clang 4.0.0 -> 5.0.0
- cmake 3.9.2 -> 3.12.4
- python 3.4.3 -> 3.5.2
* cppcheck version kept at 1.61 (for trusty) due to many
false positives with version 1.72 (for xenial)
* Community code contribution documentation simplified to remove
version of cppcheck, as this may outdated with updates to scripts
Diffstat (limited to 'travis/install.sh')
| -rwxr-xr-x | travis/install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/travis/install.sh b/travis/install.sh index 2363be43..0eaff801 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -34,8 +34,8 @@ cd $TAR_DIRECTORY # autoconf build from generated tarball 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 $CXXFLAGS" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni +if [ -f $JAVA_HOME/include/jni.h ]; then + CXXFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/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 |