Merge remote-tracking branch 'osgeo/master'

20 files changed, 5 insertions, 263 deletions

diff --git a/travis/after_success.sh b/travis/after_success.sh
index 095bafbd..abe11d91 100755
--- a/travis/after_success.sh
+++ b/travis/after_success.sh
@@ -2,13 +2,6 @@
 
 set -e
 
-if [ "$BUILD_NAME" != "linux_clang" ]; then
-    # coveralls falsely reports .c-files in the build directories as having 100% coverage so we exclude them
-    coveralls --build-root src --extension .c --extension .cpp \
-        --exclude build_autoconf --exclude build_cmake --exclude test --exclude examples \
-        --exclude include/proj/internal/nlohmann
-fi
-
 echo "$TRAVIS_SECURE_ENV_VARS"
 ./travis/build_docs.sh
 # Only build and publish docs when changes are made on most recent maintenance branch
diff --git a/travis/csa/before_install.sh b/travis/csa/before_install.sh
deleted file mode 100755
index 0ebc94fb..00000000
--- a/travis/csa/before_install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev
-
-CLANG_LLVM=clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04
-wget http://releases.llvm.org/9.0.0/$CLANG_LLVM.tar.xz
-tar xJf $CLANG_LLVM.tar.xz
-mv $CLANG_LLVM clang+llvm-9
diff --git a/travis/csa/install.sh b/travis/csa/install.sh
deleted file mode 100755
index 349afcb1..00000000
--- a/travis/csa/install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# prepare build files
-./autogen.sh
-
-export PATH=$PWD/clang+llvm-9/bin:$PATH
-CXXFLAGS="-std=c++11" scan-build -o scanbuildoutput -plist -v ./configure
-rm -rf scanbuildoutput
-TOPDIR=$PWD
-scan-build -o $TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j2
-
-sudo apt-get install jq
-
-rm -f filtered_scanbuild.txt
-files=$(find scanbuildoutput -name "*.sarif")
-for f in $files; do
-    jq '.runs[].results[] | (if .locations[].physicalLocation.fileLocation.uri | (contains("_generated_parser") ) then empty else { "uri": .locations[].physicalLocation.fileLocation.uri, "msg": .message.text, "location": .codeFlows[-1].threadFlows[-1].locations[-1] } end)' < $f > tmp.txt
-    if [ -s tmp.txt ]; then
-        echo "Errors from $f: "
-        cat $f
-        echo ""
-        cat tmp.txt >> filtered_scanbuild.txt
-    fi
-done
-if [ -s filtered_scanbuild.txt ]; then
-    echo ""
-    echo ""
-    echo "========================"
-    echo "Summary of errors found:"
-    cat filtered_scanbuild.txt
-    /bin/false
-fi
diff --git a/travis/install.sh b/travis/install.sh
index 8897f823..6426e1b3 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -41,8 +41,9 @@ 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
     echo "Checking exported symbols..."
-    $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so > /tmp/got_symbols.txt
-    diff -u $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1)
+    cat $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt | sort > /tmp/reference_exported_symbols.txt
+    $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so | sort > /tmp/got_symbols.txt
+    diff -u /tmp/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1)
 fi
 fi
 
@@ -98,7 +99,7 @@ if [ $TRAVIS_OS_NAME != "osx" ]; then
     fi
 fi
 
-if [ "$BUILD_NAME" != "linux_gcc8" ]; then
+if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
 
     # cmake build from generated tarball
     mkdir build_cmake
@@ -140,12 +141,4 @@ if [ "$BUILD_NAME" != "linux_gcc8" ]; then
     fi
     make >/dev/null
     make check
-
-    if [ "$BUILD_NAME" != "linux_clang" ]; then
-        mv src/.libs/*.gc* src
-        mv src/conversions/.libs/*.gc* src/conversions
-        mv src/iso19111/.libs/*.gc* src/iso19111
-        mv src/projections/.libs/*.gc* src/projections
-        mv src/transformations/.libs/*.gc* src/transformations
-    fi
 fi
diff --git a/travis/linux_clang/after_success.sh b/travis/linux_clang/after_success.sh
deleted file mode 100755
index 9618f673..00000000
--- a/travis/linux_clang/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing
diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh
deleted file mode 100755
index 50c02882..00000000
--- a/travis/linux_clang/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-# -fno-use-cxa-atexit is needed to build with -coverage
-CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./travis/install.sh
diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh
deleted file mode 100755
index 3068794d..00000000
--- a/travis/linux_gcc/before_install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq \
-        lcov \
-        doxygen graphviz \
-        sqlite3 libsqlite3-dev \
-        libtiff-dev libcurl4-openssl-dev \
-        cppcheck
-
-scripts/cppcheck.sh
-scripts/doxygen.sh
-
-pip3 install --user sphinxcontrib-bibtex
-pip3 install --user cpp-coveralls
-pip3 install --user cmake==3.9.6
-
-./travis/docker.sh
diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh
deleted file mode 100755
index 5dd97f07..00000000
--- a/travis/linux_gcc/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror" CXXFLAGS="-Werror" ./travis/install.sh
diff --git a/travis/linux_gcc8/after_success.sh b/travis/linux_gcc8/after_success.sh
deleted file mode 100755
index 70c6f5cb..00000000
--- a/travis/linux_gcc8/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#./travis/after_success.sh
diff --git a/travis/linux_gcc8/before_install.sh b/travis/linux_gcc8/before_install.sh
deleted file mode 100755
index ff6c0927..00000000
--- a/travis/linux_gcc8/before_install.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo aptitude remove -q -y libtiff-dev libcurl4-gnutls-dev
-sudo aptitude install -q -y \
-        lcov \
-        doxygen graphviz \
-        sqlite3 libsqlite3-dev:$ARCH \
-        libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH
-
-#scripts/cppcheck.sh
-#scripts/doxygen.sh
-
-#pip install --user sphinxcontrib-bibtex
-#pip install --user cpp-coveralls
-
-#./travis/docker.sh
diff --git a/travis/linux_gcc8/install.sh b/travis/linux_gcc8/install.sh
deleted file mode 100755
index 7fa8cfa4..00000000
--- a/travis/linux_gcc8/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh
diff --git a/travis/mingw32/after_success.sh b/travis/mingw32/after_success.sh
deleted file mode 100755
index 9618f673..00000000
--- a/travis/mingw32/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing
diff --git a/travis/mingw32/before_install.sh b/travis/mingw32/before_install.sh
deleted file mode 100755
index f33d18ff..00000000
--- a/travis/mingw32/before_install.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq \
-        wget \
-        binutils-mingw-w64-x86-64 \
-        gcc-mingw-w64-x86-64 \
-        g++-mingw-w64-x86-64 \
-        mingw-w64-tools \
-        wine1.4-amd64 \
-        sqlite3
diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh
deleted file mode 100755
index 67873dd1..00000000
--- a/travis/mingw32/install.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -e
-
-unset CC
-unset CXX
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-MINGW_ARCH=x86_64-w64-mingw32
-MINGW_PREFIX=/usr/lib/gcc/$MINGW_ARCH/5.3-posix
-
-# prepare wine environment
-WINE_SYSDIR=$HOME/.wine/drive_c/windows
-wine64 cmd /c dir
-ln -s $MINGW_PREFIX/libstdc++-6.dll $WINE_SYSDIR
-ln -s $MINGW_PREFIX/libgcc_s_seh-1.dll $WINE_SYSDIR
-ln -s $MINGW_PREFIX/libgcc_s_sjlj-1.dll $WINE_SYSDIR
-ln -s /usr/$MINGW_ARCH/lib/libwinpthread-1.dll $WINE_SYSDIR
-
-# build zlib
-wget https://github.com/madler/zlib/archive/v1.2.11.tar.gz
-tar xzf v1.2.11.tar.gz
-(cd zlib-1.2.11 && sudo make install -fwin32/Makefile.gcc SHARED_MODE=1 PREFIX=x86_64-w64-mingw32- DESTDIR=/usr/$MINGW_ARCH/)
-sudo mkdir -p  /usr/$MINGW_ARCH/include
-sudo mkdir -p  /usr/$MINGW_ARCH/lib
-sudo cp /usr/$MINGW_ARCH/*.h  /usr/$MINGW_ARCH/include
-sudo cp /usr/$MINGW_ARCH/libz.* /usr/$MINGW_ARCH/lib
-ln -s /usr/$MINGW_ARCH/zlib1.dll $WINE_SYSDIR
-
-# build libtiff
-wget https://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz
-tar xzf tiff-4.1.0.tar.gz
-(cd tiff-4.1.0 && ./configure --host=$MINGW_ARCH --prefix=/usr/$MINGW_ARCH && make -j2 && sudo make install)
-ln -s /usr/$MINGW_ARCH/bin/libtiff-5.dll $WINE_SYSDIR
-
-# build sqlite3
-wget https://sqlite.org/2018/sqlite-autoconf-3250100.tar.gz
-tar xzf sqlite-autoconf-3250100.tar.gz
-(cd sqlite-autoconf-3250100 && CC="ccache $MINGW_ARCH-gcc" CXX="ccache $MINGW_ARCH-g++" LD=$MINGW_ARCH-ld
-./configure --host=$MINGW_ARCH --prefix=/usr/$MINGW_ARCH && make -j2 && sudo make install)
-ln -s /usr/$MINGW_ARCH/bin/libsqlite3-0.dll $WINE_SYSDIR
-
-# prepare build files
-./autogen.sh
-# autoconf build
-mkdir build_autoconf
-cd build_autoconf
-CC="ccache $MINGW_ARCH-gcc" CXX="ccache $MINGW_ARCH-g++" LD=$MINGW_ARCH-ld ../configure --host=$MINGW_ARCH --prefix=/tmp/proj_autoconf_install --without-curl
-make -j2
-make install
-make dist-all
-find /tmp/proj_autoconf_install
-(cd test; make -j2)
-cp -r ../data/tests /tmp/proj_autoconf_install/share/proj
-cp ../data/tests/egm96_15_downsampled.gtx /tmp/proj_autoconf_install/share/proj/egm96_15.gtx
-cp ../data/tests/ntv2_0_downsampled.gsb /tmp/proj_autoconf_install/share/proj/ntv2_0.gsb
-test/unit/test_cpp_api.exe
diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh
deleted file mode 100755
index 9618f673..00000000
--- a/travis/osx/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh
deleted file mode 100755
index 5af2fd7a..00000000
--- a/travis/osx/before_install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export PATH=$HOME/Library/Python/3.7/bin:$PATH
-
-#brew unlink python@2
-#brew update
-brew install ccache
-#brew upgrade sqlite3
-#brew upgrade libtiff
-#brew install doxygen graphviz
-#brew install md5sha1sum
-#brew reinstall python
-#brew reinstall wget
-
-./travis/before_install_pip.sh
-
-# pip3 install --user sphinx sphinx-rtd-theme sphinxcontrib-bibtex breathe
-# which sphinx-build
-
-# (cd docs; make html)
diff --git a/travis/osx/install.sh b/travis/osx/install.sh
deleted file mode 100755
index ff5266f6..00000000
--- a/travis/osx/install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-export PATH=$HOME/Library/Python/3.6/bin:$PATH
-
-CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -O2" CXXFLAGS="-Werror -O2" ./travis/install.sh
diff --git a/travis/linux_gcc/after_success.sh b/travis/publish_doc/after_success.sh
index 6602f6c3..6602f6c3 100755
--- a/travis/linux_gcc/after_success.sh
+++ b/travis/publish_doc/after_success.sh
diff --git a/travis/linux_clang/before_install.sh b/travis/publish_doc/before_install.sh
index c4b8acad..bbb7b35b 100755
--- a/travis/linux_clang/before_install.sh
+++ b/travis/publish_doc/before_install.sh
@@ -4,5 +4,4 @@ set -e
 
 ./travis/before_install_apt.sh
 ./travis/before_install_pip.sh
-
-sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev
+./travis/docker.sh
diff --git a/travis/csa/after_success.sh b/travis/publish_doc/install.sh
index 9618f673..d9628ae7 100755
--- a/travis/csa/after_success.sh
+++ b/travis/publish_doc/install.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
 set -e
-
-# nothing