diff options
| author | Pierre-Yves Rollo <dev@pyrollo.com> | 2019-06-21 02:43:59 +0200 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2019-06-21 01:46:00 +0100 |
| commit | 39c54e13c3ee3558f330f4d5716d8073b48de11a (patch) | |
| tree | 83338890c7b9d6a3e8c3753c15ded42c74688a4c /util/travis | |
| parent | e3738c2f61b4ebff97eadce88dda10c9a7610d3d (diff) | |
| download | minetest-39c54e13c3ee3558f330f4d5716d8073b48de11a.tar.gz minetest-39c54e13c3ee3558f330f4d5716d8073b48de11a.tar.bz2 minetest-39c54e13c3ee3558f330f4d5716d8073b48de11a.zip | |
Improve buildbot script
PR created under the employment of EvidenceBKidscode
* Variables to set git repositories urls (allows to build from another repo)
* Variables to set git branch to build from (allows to build from non-master branch)
* Variables to change built name
* Make -j uses the proper number of processors (autodetect)
* Changed toolchain from win32 to adpat it to non-debian distros
Diffstat (limited to 'util/travis')
| -rwxr-xr-x | util/travis/before_install.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index fef054130..fe9243583 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -20,9 +20,7 @@ elif [[ $PLATFORM == "Win32" ]]; then 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 + # buildwin32.sh detects the installed toolchain automatically sudo 7z x -y -o/usr mingw.7z elif [[ $PLATFORM == "Win64" ]]; then sudo apt-get update |