From 39c54e13c3ee3558f330f4d5716d8073b48de11a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Fri, 21 Jun 2019 02:43:59 +0200 Subject: 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 --- util/travis/before_install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'util/travis') 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 -- cgit v1.2.3