diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 6 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 6 | ||||
| -rw-r--r-- | util/ci/common.sh | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index e54c1af4d..3df48f178 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game GAME_BRANCH=master GAME_NAME=minetest_game -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" exit 1 @@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then echo "Unable to determine which MinGW compiler to use" exit 1 fi -toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake +toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake echo "Using $toolchain_file" # Try to find runtime DLLs in various paths (varies by distribution, sigh) @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt7 +irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt) ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index af6b5b350..9d222ab42 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game GAME_BRANCH=master GAME_NAME=minetest_game -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" exit 1 @@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then echo "Unable to determine which MinGW compiler to use" exit 1 fi -toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake +toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake echo "Using $toolchain_file" # Try to find runtime DLLs in various paths (varies by distribution, sigh) @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt7 +irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt) ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 diff --git a/util/ci/common.sh b/util/ci/common.sh index db525a61c..3015680c4 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -10,7 +10,8 @@ install_linux_deps() { if [[ "$1" == "--no-irr" ]]; then shift else - wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt7/ubuntu-bionic.tar.gz" + local ver=$(cat misc/irrlichtmt_tag.txt) + wget "https://github.com/minetest/irrlicht/releases/download/$ver/ubuntu-bionic.tar.gz" sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local fi |