diff options
| -rwxr-xr-x | travis/install.sh | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/travis/install.sh b/travis/install.sh index ed7822a7..714d21ed 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -2,13 +2,8 @@ set -e -# Download grid files to nad/ +# Download grid files wget http://download.osgeo.org/proj/proj-datumgrid-1.7.zip -cd nad -unzip -o ../proj-datumgrid-1.7.zip -GRIDDIR=`pwd` -echo $GRIDDIR -cd .. # prepare build files ./autogen.sh @@ -30,7 +25,9 @@ cd build_autoconf ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all make -j3 make install -PROJ_LIB=$GRIDDIR make check +# We have a small issue with out-of-tree builds where the null file is generated in the build directory, but other non-generated stuff is in $(top_srcdir)/nad +# Workaround this by using the install directory... +PROJ_LIB=/tmp/proj_autoconf_install_from_dist_all/share/proj make check find /tmp/proj_autoconf_install_from_dist_all cd .. @@ -40,21 +37,22 @@ cd build_cmake cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install make -j3 make install -PROJ_LIB=$GRIDDIR ctest +# The cmake build is not able to generate the null file, so copy it at hand +cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj +PROJ_LIB=/tmp/proj_cmake_install/share/proj ctest find /tmp/proj_cmake_install cd .. # return to root cd ../.. -# cmake build with grids -mkdir build_cmake_nad -cd build_cmake_nad -cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install_nad -make -j3 -make install -find /tmp/proj_cmake_install_nad +# Install grid files +cd nad +unzip -o ../proj-datumgrid-1.7.zip +GRIDDIR=`pwd` +echo $GRIDDIR cd .. + # autoconf build with grids mkdir build_autoconf_nad cd build_autoconf_nad @@ -69,6 +67,7 @@ make test228 cd .. PROJ_LIB=../nad src/multistresstest cd .. + # autoconf build with grids and coverage if [ $TRAVIS_OS_NAME == "osx" ]; then CFLAGS="--coverage" ./configure; |