BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix some issues with buildbot scripts (#11860)

Browse Source
This commit is contained in:
sfan5 2021-12-15 14:36:27 +01:00 committed by GitHub
parent fcf86ded8f
commit 378175497a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/buildbot/buildwin32.sh
View File

@ -31,9 +31,16 @@ fi
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file" echo "Using $toolchain_file"
tmp=$(dirname "$(command -v $compiler)")/../i686-w64-mingw32/bin # Try to find runtime DLLs in various paths (varies by distribution, sigh)
tmp=$(dirname "$(command -v $compiler)")/..
runtime_dlls= runtime_dlls=
[ -d "$tmp" ] && runtime_dlls=$(echo $tmp/lib{gcc_,stdc++-,winpthread-}*.dll | tr ' ' ';') for name in lib{gcc_,stdc++-,winpthread-}'*'.dll; do
for dir in $tmp/i686-w64-mingw32/{bin,lib} $tmp/lib/gcc/i686-w64-mingw32/*; do
[ -d "$dir" ] || continue
file=$(echo $dir/$name)
[ -f "$file" ] && { runtime_dlls+="$file;"; break; }
done
done
[ -z "$runtime_dlls" ] && [ -z "$runtime_dlls" ] &&
echo "The compiler runtime DLLs could not be found, they might be missing in the final package." echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
@ -89,10 +96,12 @@ download "http://minetest.kitsunemimi.pw/openal_stripped.zip" '' unzip_nofolder
if [ -n "$EXISTING_MINETEST_DIR" ]; then if [ -n "$EXISTING_MINETEST_DIR" ]; then
sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )" sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
else else
cd $builddir
sourcedir=$PWD/$CORE_NAME sourcedir=$PWD/$CORE_NAME
[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \ [ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \
git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME
if [ -z "$NO_MINETEST_GAME" ]; then if [ -z "$NO_MINETEST_GAME" ]; then
cd $sourcedir
[ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \ [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
fi fi

13
util/buildbot/buildwin64.sh
View File

@ -31,9 +31,16 @@ fi
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file" echo "Using $toolchain_file"
tmp=$(dirname "$(command -v $compiler)")/../x86_64-w64-mingw32/bin # Try to find runtime DLLs in various paths (varies by distribution, sigh)
tmp=$(dirname "$(command -v $compiler)")/..
runtime_dlls= runtime_dlls=
[ -d "$tmp" ] && runtime_dlls=$(echo $tmp/lib{gcc_,stdc++-,winpthread-}*.dll | tr ' ' ';') for name in lib{gcc_,stdc++-,winpthread-}'*'.dll; do
for dir in $tmp/x86_64-w64-mingw32/{bin,lib} $tmp/lib/gcc/x86_64-w64-mingw32/*; do
[ -d "$dir" ] || continue
file=$(echo $dir/$name)
[ -f "$file" ] && { runtime_dlls+="$file;"; break; }
done
done
[ -z "$runtime_dlls" ] && [ -z "$runtime_dlls" ] &&
echo "The compiler runtime DLLs could not be found, they might be missing in the final package." echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
@ -89,10 +96,12 @@ download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped
if [ -n "$EXISTING_MINETEST_DIR" ]; then if [ -n "$EXISTING_MINETEST_DIR" ]; then
sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )" sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
else else
cd $builddir
sourcedir=$PWD/$CORE_NAME sourcedir=$PWD/$CORE_NAME
[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \ [ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \
git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME
if [ -z "$NO_MINETEST_GAME" ]; then if [ -z "$NO_MINETEST_GAME" ]; then
cd $sourcedir
[ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \ [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
fi fi