Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0

5 files changed, 16 insertions, 54 deletions

diff --git a/travis/before_install.sh b/travis/before_install.sh
index ccf59936..ac45a6d4 100755
--- a/travis/before_install.sh
+++ b/travis/before_install.sh
@@ -2,18 +2,3 @@
 
 # All platform-specific before_install scripts starts by running this
 # "global" before_install script.
-
-# Specify which version of python to use. The default python to use on Travis
-# can vary from platform to platform, so we use pyenv to make sure we use
-# a version that works for the complete build processs. (Not in use at the moment,
-# since the pyenv setup on Travis is not consistent across platforms and partly
-# broken as well)
-#pyenv global system 3.5
-#pyenv versions # a bit of debug info
-
-# What is the current python setup?
-which python
-python --version
-
-which pip
-pip --version
diff --git a/travis/install.sh b/travis/install.sh
index 8126182b..a12de9c6 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -2,6 +2,15 @@
 
 set -e
 
+# Download grid files to nad/
+wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip
+cd nad
+unzip -o ../proj-datumgrid-1.6.zip
+wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx
+GRIDDIR=`pwd`
+echo $GRIDDIR
+cd ..
+
 # prepare build files
 ./autogen.sh
 # cmake build
@@ -20,7 +29,7 @@ make -j3
 make install
 make dist-all
 find /tmp/proj_autoconf_install
-make check
+PROJ_LIB=$GRIDDIR make check
 # Check consistency of generated tarball
 TAR_FILENAME=`ls *.tar.gz`
 TAR_DIRECTORY=`basename $TAR_FILENAME .tar.gz`
@@ -29,8 +38,7 @@ cd $TAR_DIRECTORY
 ./configure --prefix=/tmp/proj_autoconf_install_from_dist_all
 make -j3
 make install
-make dist-all
-make check
+PROJ_LIB=$GRIDDIR make check
 CURRENT_PWD=`pwd`
 cd /tmp/proj_autoconf_install
 find | sort > /tmp/list_proj_autoconf_install.txt
@@ -42,14 +50,6 @@ cd $CURRENT_PWD
 cd ..
 #
 cd ..
-# Now with grids
-wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip
-cd nad
-unzip -o ../proj-datumgrid-1.6.zip
-wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx
-GRIDDIR=`pwd`
-echo $GRIDDIR
-cd ..
 # cmake build with grids
 mkdir build_cmake_nad
 cd build_cmake_nad
@@ -65,7 +65,7 @@ cd build_autoconf_nad
 make -j3
 make install
 find /tmp/proj_autoconf_install_nad
-make check
+PROJ_LIB=$GRIDDIR make check
 cd src
 make multistresstest
 make test228
@@ -79,29 +79,6 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then
       CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure;
     fi
 make -j3
-make check
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/builtins.gie
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/more_builtins.gie
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/deformation.gie
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/axisswap.gie
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/ellipsoid.gie
-PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/GDA.gie
-
-# install & run the working GIGS test
-  # create locations that pyproj understands
-ln -s src include
-ln -s src/.libs lib
-mkdir share
-ln -s nad share/proj
-pwd
-  # install pyproj
-export CFLAGS=
-PROJ_DIR=`pwd` pip install -v --user pyproj
-
-cd test/gigs
-  # run test_json.py
-PROJ_LIB=../../nad python test_json.py --test conversion 5101.1-jhs.json 5101.4-jhs-etmerc.json 5105.2.json 5106.json 5108.json 5110.json 5111.1.json
-PROJ_LIB=../../nad python test_json.py 5101.2-jhs.json 5101.3-jhs.json 5102.1.json 5103.1.json 5103.2.json 5103.3.json 5107.json 5109.json 5112.json 5113.json 5201.json 5208.json
-cd ../..
+PROJ_LIB=$GRIDDIR make check
 
 mv src/.libs/*.gc* src
diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh
index a0dd9353..cacb3f85 100755
--- a/travis/linux_clang/install.sh
+++ b/travis/linux_clang/install.sh
@@ -4,4 +4,4 @@ set -e
 
 export CCACHE_CPP2=yes
 
-CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -fsanitize=address -O2" ./travis/install.sh
+CC="ccache clang" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -fsanitize=address -O2" ./travis/install.sh
diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh
index 571e02b7..6910322c 100755
--- a/travis/linux_gcc/install.sh
+++ b/travis/linux_gcc/install.sh
@@ -5,4 +5,4 @@ set -e
 export CCACHE_CPP2=yes
 
 #  -Wfloat-conversion not available for gcc 4.8
-CC="ccache gcc" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh
+CC="ccache gcc" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh
diff --git a/travis/osx/install.sh b/travis/osx/install.sh
index 56e16ce6..8c25e1f1 100755
--- a/travis/osx/install.sh
+++ b/travis/osx/install.sh
@@ -4,4 +4,4 @@ set -e
 
 export CCACHE_CPP2=yes
 
-CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh
+CC="ccache clang" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh