do not run on the same commit hash more than once

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 9d366580e468d6a1c9d6836745dd9ee70c975df2..ee4d75aa64b808170180e095d1593d8d969fe63f 100755 (executable)
--- a/all
+++ b/all
@@ -978,7 +978,13 @@ case "$cmd" in
                srcdir=$5
                depsdir=$6
                targetfiles=$7
+               set -x
                if [ -n "$targetfiles" ]; then
+                       case " $HOSTS_THAT_ARE_DISABLED " in
+                               *\ $host\ *)
+                                       exit
+                                       ;;
+                       esac
                        case " $HOSTS_THAT_ARE_MYSELF " in
                                *\ $host\ *)
                                        verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/"
@@ -992,7 +998,7 @@ case "$cmd" in
                                *)
                                        verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
                                        verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
-                                       verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && make clean $maketargets $makeflags"
+                                       verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
                                        for f in $targetfiles; do
                                                verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
                                        done
@@ -1177,16 +1183,29 @@ case "$cmd" in
                        major=$(($gv / 10000))
                        minor=$(($gv / 100 - $major * 100))
                        patch=$(($gv - $major * 10000 - $minor * 100))
+                       versionstr="$major.$minor.$patch"
+                       case "$RELEASETYPE" in
+                               beta)
+                                       versionstr="$versionstr""beta"
+                                       ;;
+                       esac
                        verbose sed -i "
-                               s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /;
+                               s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
                                s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
                        " defaultXonotic.cfg
+                       (
+                               verbose cd gfx/menu/luminos
+                               verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
+                               verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
+                               verbose rm background_l2.svg
+                       )
                fi
                if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
                        for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
                                if [ -f "$X" ]; then
                                        verbose unzip "$X"
+                                       verbose rm -f maps/*.log maps/*.irc maps/*.lin
                                fi
                        done
                fi