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/buildbot/buildwin32.sh | |
| 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/buildbot/buildwin32.sh')
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index 6646ca164..9af4eb02e 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -1,6 +1,13 @@ #!/bin/bash set -e +CORE_GIT=https://github.com/minetest/minetest +CORE_BRANCH=master +CORE_NAME=minetest +GAME_GIT=https://github.com/minetest/minetest_game +GAME_BRANCH=master +GAME_NAME=minetest_game + dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" @@ -12,7 +19,18 @@ builddir="$( cd "$builddir" && pwd )" packagedir=$builddir/packages libdir=$builddir/libs -toolchain_file=$dir/toolchain_mingw.cmake +# Test which win32 compiler is present +which i586-mingw32msvc-windres > /dev/null 2>&1 && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake +which i686-w64-mingw32-windres > /dev/null 2>&1 && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake + +if [ -z "$toolchain_file" ] +then + echo "Unable to determine which mingw32 compiler to use" + exit 1 +else + echo "Using $toolchain_file" +fi + irrlicht_version=1.8.4 ogg_version=1.3.2 vorbis_version=1.3.5 @@ -70,22 +88,22 @@ cd $libdir # Get minetest cd $builddir if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then - ln -s $EXISTING_MINETEST_DIR minetest + ln -s $EXISTING_MINETEST_DIR $CORE_NAME else - [ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest) + [ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT) fi -cd minetest +cd $CORE_NAME git_hash=$(git rev-parse --short HEAD) # Get minetest_game cd games if [ "x$NO_MINETEST_GAME" = "x" ]; then - [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game) + [ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT) fi cd ../.. # Build the thing -cd minetest +cd $CORE_NAME [ -d _build ] && rm -Rf _build/ mkdir _build cd _build @@ -149,7 +167,7 @@ cmake .. \ -DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \ -DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll -make -j2 +make -j$(nproc) [ "x$NO_PACKAGE" = "x" ] && make package |