From 7fbdf50544806929766c0afb07804b3025594427 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Sun, 15 Oct 2023 21:11:59 +1000 Subject: [PATCH] Add support for schroot builds --- misc/infrastructure/xonotic-release-build.cron | 3 ++- misc/tools/all/release.subr | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron index ef433c54..8e80bf77 100755 --- a/misc/infrastructure/xonotic-release-build.cron +++ b/misc/infrastructure/xonotic-release-build.cron @@ -31,7 +31,8 @@ export CACHEDIR=$HOME/.xonotic-cached-converter-crunch export dds_tool=crunch # Build locally. -export HOSTS_THAT_ARE_MYSELF='xonotic-build-linux64 xonotic-build-win32 xonotic-build-win64 xonotic-build-osx' +export HOSTS_THAT_ARE_MYSELF='xonotic-build-win32 xonotic-build-win64 xonotic-build-osx' +export HOSTS_THAT_ARE_SCHROOT='xonotic-build-linux64' mepwd=$PWD me=$0 diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index e92d12e8..8a43458c 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -215,6 +215,7 @@ case "$cmd" in srcdir=$5 depsdir=$6 targetfiles=$7 + schroot= set -x if [ -z "$targetfiles" ]; then exit @@ -224,13 +225,18 @@ case "$cmd" in exit ;; esac - case " $HOSTS_THAT_ARE_MYSELF " in + case " $HOSTS_THAT_ARE_SCHROOT " in + *\ $host\ *) + schroot="schroot -c $host --" + ;; + esac + case " $HOSTS_THAT_ARE_MYSELF $HOSTS_THAT_ARE_SCHROOT " in *\ $host\ *) verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/" verbose rsync --delete -zLvaSHP misc/logos/icons_ico/xonotic.ico "$buildpath"/darkplaces.ico verbose rsync --delete -zLvaSHP "$depsdir"/*/ "$buildpath.deps/" verbose ln -snf "$buildpath.deps" "$buildpath/.deps" - verbose eval make -C "$buildpath" clean $maketargets $makeflags + verbose eval $schroot make -C "$buildpath" clean $maketargets $makeflags for f in $targetfiles; do verbose mv "$buildpath/${f%:*}" "${f##*:}" || true done -- 2.39.2