diff options
| author | Mike Taves <mwtoews@gmail.com> | 2019-09-25 11:47:40 +1200 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2019-09-25 20:50:07 +1200 |
| commit | 4013aeaaf7796cfff6b97668870ce4a2af3d509a (patch) | |
| tree | 3d19245a8df8c4f102d28c4b19a1065d81957b8f /travis/mingw32 | |
| parent | 14828d9695ab54272fee0dab35a489180c20f2ea (diff) | |
| download | PROJ-4013aeaaf7796cfff6b97668870ce4a2af3d509a.tar.gz PROJ-4013aeaaf7796cfff6b97668870ce4a2af3d509a.zip | |
Upgrade testing from trusty to xenial, and also:
* From openjdk-7 via apt to openjdk-11 via Travis CI xenial's $JAVA_HOME
* From mingw 4.8 -> 5.3, as supported by xenial
* clang+llvm for csa kept at version 6.0.0, but for ubuntu-16.04
* Furthermore xenial implicitly has many upgrades, specifically:
- gcc 4.8.4 -> 5.4.0
- clang 4.0.0 -> 5.0.0
- cmake 3.9.2 -> 3.12.4
- python 3.4.3 -> 3.5.2
* cppcheck version kept at 1.61 (for trusty) due to many
false positives with version 1.72 (for xenial)
* Community code contribution documentation simplified to remove
version of cppcheck, as this may outdated with updates to scripts
Diffstat (limited to 'travis/mingw32')
| -rwxr-xr-x | travis/mingw32/install.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index 867ca716..52e4f7a6 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -6,12 +6,13 @@ 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 +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 |