diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-09-19 12:50:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 12:50:16 +0200 |
| commit | 4ea0c2d72c80120a6074b97577a2659e23015f5c (patch) | |
| tree | fababdffc9751602fab1930f2b6413f424667977 /travis | |
| parent | 722b2a4ea7ea329fabea4dd92ca1b2c60799f0d7 (diff) | |
| parent | eb2862c80971f106c69bfb46e8324104634fe1f2 (diff) | |
| download | PROJ-4ea0c2d72c80120a6074b97577a2659e23015f5c.tar.gz PROJ-4ea0c2d72c80120a6074b97577a2659e23015f5c.zip | |
Merge pull request #1125 from rouault/rename_nad_as_data
Rename nad/ as data/ and move nad/test* to test/old/*
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/install.sh | 14 | ||||
| -rwxr-xr-x | travis/mingw32/install.sh | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/travis/install.sh b/travis/install.sh index 714d21ed..eecf343a 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -25,7 +25,7 @@ cd build_autoconf ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all make -j3 make install -# 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 +# 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)/data # 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 @@ -47,25 +47,25 @@ cd .. cd ../.. # Install grid files -cd nad +cd data unzip -o ../proj-datumgrid-1.7.zip GRIDDIR=`pwd` echo $GRIDDIR cd .. # autoconf build with grids -mkdir build_autoconf_nad -cd build_autoconf_nad -../configure --prefix=/tmp/proj_autoconf_install_nad +mkdir build_autoconf_grids +cd build_autoconf_grids +../configure --prefix=/tmp/proj_autoconf_install_grids make -j3 make install -find /tmp/proj_autoconf_install_nad +find /tmp/proj_autoconf_install_grids PROJ_LIB=$GRIDDIR make check cd src make multistresstest make test228 cd .. -PROJ_LIB=../nad src/multistresstest +PROJ_LIB=../data src/multistresstest cd .. # autoconf build with grids and coverage diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index c57b03d3..8abc98ac 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -18,12 +18,12 @@ find /tmp/proj_autoconf_install cd .. # Now with grids wget http://download.osgeo.org/proj/proj-datumgrid-1.5.zip -cd nad +cd data unzip -o ../proj-datumgrid-1.5.zip cd .. # autoconf build with grids -mkdir build_autoconf_nad -cd build_autoconf_nad +mkdir build_autoconf_grids +cd build_autoconf_grids CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install_nad make -j3 make install @@ -33,6 +33,6 @@ cd src make multistresstest.exe make test228.exe cd .. -PROJ_LIB=../nad src/multistresstest.exe -num_iterations 100000 +PROJ_LIB=../data src/multistresstest.exe -num_iterations 100000 cd .. |