diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-05-21 21:00:56 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:32:00 +0200 |
| commit | 24abdf45b98be8d7120d722be8279d268a16f65a (patch) | |
| tree | 43939bb1be994410adf01003a62620a9b80e772b | |
| parent | 263400b3d89c9499cb4be706461760bb5ccd9f5d (diff) | |
| download | minetest-24abdf45b98be8d7120d722be8279d268a16f65a.tar.gz minetest-24abdf45b98be8d7120d722be8279d268a16f65a.tar.bz2 minetest-24abdf45b98be8d7120d722be8279d268a16f65a.zip | |
Fix windows toolchain due to missing packages, upgrade to more recent toolchain
| -rwxr-xr-x | util/travis/before_install.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index a4328fa46..af69f78ca 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -1,4 +1,5 @@ #!/bin/bash -e + echo "Preparing for $TRAVIS_COMMIT_RANGE" if [[ "$LINT" == "1" ]]; then @@ -37,13 +38,17 @@ if [[ $PLATFORM == "Unix" ]]; then #brew upgrade postgresql fi elif [[ $PLATFORM == "Win32" ]]; then - wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z + sudo apt-get update + sudo apt-get install p7zip-full + wget http://minetest.kitsunemimi.pw/mingw-w64-i686_7.1.1_ubuntu14.04.7z -O mingw.7z sed -e "s|%PREFIX%|i686-w64-mingw32|" \ -e "s|%ROOTPATH%|/usr/i686-w64-mingw32|" \ < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw.cmake sudo 7z x -y -o/usr mingw.7z elif [[ $PLATFORM == "Win64" ]]; then - wget http://minetest.kitsunemimi.pw/mingw_w64_x86_64_ubuntu12.04_4.9.1.7z -O mingw.7z + sudo apt-get update + sudo apt-get install p7zip-full + wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_7.1.1_ubuntu14.04.7z -O mingw.7z sed -e "s|%PREFIX%|x86_64-w64-mingw32|" \ -e "s|%ROOTPATH%|/usr/x86_64-w64-mingw32|" \ < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake |