diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-22 14:09:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 14:09:35 +0100 |
| commit | a95431d8666db9953115a3a824db396f8aa82b52 (patch) | |
| tree | 21117e52f95b8f36880efef8cd71c1fcec21242c /travis | |
| parent | c5fb54168665d41503ef3a08f0534da58949b632 (diff) | |
| parent | 4724025e6c817761052fc0dc8810fd489a9e0104 (diff) | |
| download | PROJ-a95431d8666db9953115a3a824db396f8aa82b52.tar.gz PROJ-a95431d8666db9953115a3a824db396f8aa82b52.zip | |
Merge pull request #1855 from rouault/rfc4_merge_back_master
[RFC4_dev] Merge master back to rfc4 latest branch
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/after_success.sh | 2 | ||||
| -rwxr-xr-x | travis/install.sh | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/travis/after_success.sh b/travis/after_success.sh index ad1e5ec3..1772947e 100755 --- a/travis/after_success.sh +++ b/travis/after_success.sh @@ -12,7 +12,7 @@ fi echo "$TRAVIS_SECURE_ENV_VARS" ./travis/build_docs.sh # Only build and publish docs when changes are made on most recent maintenance branch -if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "6.2"; then +if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "6.3"; then echo "publish website"; ./travis/add_deploy_key.sh; ./travis/deploy_website.sh $TRAVIS_BUILD_DIR/docs/build /tmp; diff --git a/travis/install.sh b/travis/install.sh index c41dc014..a8b98f98 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -15,6 +15,7 @@ echo "NPROC=${NPROC}" # Download grid files wget https://download.osgeo.org/proj/proj-datumgrid-1.8.zip +wget "https://github.com/OSGeo/proj-datumgrid/blob/master/north-america/ntv2_0.gsb?raw=true" -O ntv2_0.gsb # prepare build files ./autogen.sh @@ -37,11 +38,7 @@ CXXFLAGS="-DCS=do_not_use_CS_for_solaris_compat $CXXFLAGS" # autoconf build from generated tarball mkdir build_autoconf cd build_autoconf -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 +../configure --prefix=/tmp/proj_autoconf_install_from_dist_all make -j${NPROC} @@ -95,7 +92,7 @@ cd .. cd ../.. # Install grid files -(cd data && unzip -o ../proj-datumgrid-1.8.zip) +(cd data && unzip -o ../proj-datumgrid-1.8.zip && cp ../ntv2_0.gsb . ) # autoconf build with grids mkdir build_autoconf_grids @@ -106,6 +103,10 @@ make check (cd src && make multistresstest && make test228) PROJ_LIB=../data src/multistresstest make install + +# Test make clean target +make clean + find /tmp/proj_autoconf_install_grids cd .. |