diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-10-18 18:42:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-18 18:42:31 +0200 |
| commit | 2357d264d477c5eee363514fb094772980509726 (patch) | |
| tree | c4bdcbe7d36d961a9a55241844fe1977d3434aad /travis | |
| parent | 3a2df3462c851b7dc823b1cd84fc8a61dc9c2d08 (diff) | |
| parent | ffe1922d54d4ce379c96f5472dba2e76223348f1 (diff) | |
| download | PROJ-2357d264d477c5eee363514fb094772980509726.tar.gz PROJ-2357d264d477c5eee363514fb094772980509726.zip | |
Merge pull request #2381 from rouault/fix_1453
Add multi-line PROJ string export capability, and use it by default in projinfo (unless --single-line is specified) (fixes #1543)
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/install.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/travis/install.sh b/travis/install.sh index 9bea1ba5..8897f823 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -21,7 +21,7 @@ export MAKEFLAGS="-j ${NPROC}" mkdir build_autoconf cd build_autoconf ../configure -make dist-all +make dist-all >/dev/null # Check consistency of generated tarball TAR_FILENAME=`ls *.tar.gz` TAR_DIRECTORY=`basename $TAR_FILENAME .tar.gz` @@ -36,7 +36,7 @@ mkdir build_autoconf cd build_autoconf ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all -make +make >/dev/null if [ "$(uname)" == "Linux" -a -f src/.libs/libproj.so ]; then if objdump -TC "src/.libs/libproj.so" | grep "elf64-x86-64">/dev/null; then @@ -80,7 +80,7 @@ jsonschema -i out.json /tmp/proj_autoconf_install_from_dist_all/share/proj/projj diff -u out.json out2.json # Test make clean target -make clean +make clean > /dev/null cd .. @@ -105,8 +105,8 @@ if [ "$BUILD_NAME" != "linux_gcc8" ]; then cd build_cmake cmake --version cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install - VERBOSE=1 make - make install + VERBOSE=1 make >/dev/null + make install >/dev/null ctest find /tmp/proj_cmake_install if [ $BUILD_NAME = "linux_gcc" ] || [ $BUILD_NAME = "osx" ]; then @@ -138,7 +138,7 @@ if [ "$BUILD_NAME" != "linux_gcc8" ]; then else ./configure fi - make + make >/dev/null make check if [ "$BUILD_NAME" != "linux_clang" ]; then |