Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-autobuild

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 62cb7187bec26f0121c8907f48410d48977e9c3a..90a012325b829c864083833b20f87292821e07db 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -4,7 +4,7 @@ set -e
 
 bspdir="$PWD/data"
 url=http://beta.xonotic.org/autobuild-bsp/
-url_ssh=beta.xonotic.org:autobuild-bsp/
+url_ssh=xonotic-beta:autobuild-bsp/
 cachedir="$HOME/xonotic-map-compiler.cache/"
 override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 
@@ -116,10 +116,9 @@ buildthemap()
        REFNAME=$1
        HASH=$2
        url=$3
-       bspdir=$4
-       M=$5
-       blobhash=$6
-       if [ -f "$bspdir/$M-$blobhash.pk3" ]; then
+       M=$4
+       blobhash=$5
+       if HEAD "$url$M-$blobhash.pk3"; then
                continue
        fi
        if [ -n "$IRCSPAM" ]; then
@@ -138,9 +137,11 @@ buildthemap()
        fi
        zip -9r "$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        ln -snf "../$M-$blobhash.pk3" "$M.pk3" # from ALL branches, so beware!
-       rsync -vaSHP "$M-$blobhash.pk3" "$url_ssh"
-       rsync -vaSHP "$M.pk3" "$url_ssh""latest/"
-       rm -f *.pk3
+       cp "$M-$blobhash.pk3" "$M-full-$blobhash.pk3"
+       zip -9r "$M-full-$blobhash.pk3" `git diff --name-only --diff-filter=ACMRTUXB master...HEAD` || true
+       ln -snf "../$M-full-$blobhash.pk3" "$M-full.pk3" # from ALL branches, so beware!
+       rsync -vaSHP "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" "$url_ssh"
+       rsync -vaSHP "$M.pk3" "$M-full.pk3" "$url_ssh""latest/"
        if [ -n "$IRCSPAM" ]; then
                $IRCSPAM < "maps/$M.irc"
        fi
@@ -180,7 +181,7 @@ case "$1" in
                        git reset --hard
                        git clean -xfd
                        git checkout -f "$HASH"
-                       allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir"
+                       allmaps buildthemap "$REFNAME" "$HASH" "$url"
                        touch "$cachedir/$HASH"
                done
                git checkout -f master