Rearrange Travis CI scripts to be more modular

* Split global before_install for apt and pip
* Use -qq option for apt-get, which implies -y
* Use list of targets with apt-get rather than one-per-line
* Use local variables for mingw32/install.sh
* Show version info for cppcheck, pip and python
* Simplify clang+llvm-6 path

2 files changed, 22 insertions, 18 deletions

diff --git a/travis/mingw32/before_install.sh b/travis/mingw32/before_install.sh
index d67d8194..f33d18ff 100755
--- a/travis/mingw32/before_install.sh
+++ b/travis/mingw32/before_install.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 
 set -e
-sudo apt-get update -qq
-sudo apt-get install -qq python3-pip
 
-./travis/before_install.sh
+./travis/before_install_apt.sh
+./travis/before_install_pip.sh
 
-sudo apt-get install wget
-sudo apt-get install binutils-mingw-w64-x86-64
-sudo apt-get install gcc-mingw-w64-x86-64
-sudo apt-get install g++-mingw-w64-x86-64
-sudo apt-get install g++-mingw-w64
-sudo apt-get install mingw-w64-tools
-sudo apt-get install -y wine1.4-amd64
-sudo apt-get install sqlite3
+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
index af7761c3..867ca716 100755
--- a/travis/mingw32/install.sh
+++ b/travis/mingw32/install.sh
@@ -5,24 +5,29 @@ set -e
 export CCACHE_CPP2=yes
 export PROJ_DB_CACHE_DIR="$HOME/.ccache"
 
+MINGW_ARCH=x86_64-w64-mingw32
+MINGW_PREFIX=/usr/lib/gcc/$MINGW_ARCH/4.8
+
 # prepare wine environment
+WINE_SYSDIR=$HOME/.wine/drive_c/windows
 wine64 cmd /c dir
-ln -s /usr/lib/gcc/x86_64-w64-mingw32/4.8/libstdc++-6.dll  $HOME/.wine/drive_c/windows
-ln -s /usr/lib/gcc/x86_64-w64-mingw32/4.8/libgcc_s_sjlj-1.dll  $HOME/.wine/drive_c/windows
-ln -s /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll  $HOME/.wine/drive_c/windows
+ln -s $MINGW_PREFIX/libstdc++-6.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 sqlite3
 wget https://sqlite.org/2018/sqlite-autoconf-3250100.tar.gz
 tar xzf sqlite-autoconf-3250100.tar.gz
-(cd sqlite-autoconf-3250100 &&  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=/usr/x86_64-w64-mingw32 && make -j2 && sudo make install)
-ln -s /usr/x86_64-w64-mingw32/bin/libsqlite3-0.dll  $HOME/.wine/drive_c/windows
+(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 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
+CC="ccache $MINGW_ARCH-gcc" CXX="ccache $MINGW_ARCH-g++" LD=$MINGW_ARCH-ld ../configure --host=$MINGW_ARCH --prefix=/tmp/proj_autoconf_install
 make -j2
 make install
 make dist-all
@@ -38,7 +43,7 @@ cd ..
 # autoconf build with grids
 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
+CC="ccache $MINGW_ARCH-gcc" CXX="ccache $MINGW_ARCH-g++" LD=$MINGW_ARCH-ld ../configure --host=$MINGW_ARCH --prefix=/tmp/proj_autoconf_install_nad
 make -j2
 make install
 find /tmp/proj_autoconf_install_nad