make overriding more strict again

[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 ebd10c303cf3fd2c4e8e7ef5cb7ee2b0046aed5d..d366157d3df2f4db0f7fc70839c418ddf2e89de3 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -157,28 +157,34 @@ buildthemap()
        url=$2
        M=$3
        blobhash=$4
-       HASH=$5
+       commithash=$5
        if HEAD "$url$M-$blobhash.pk3"; then
                continue
        fi
 
        git reset --hard
        git clean -xfd
-       git checkout -f "$HASH"
+       git checkout -f "$commithash"
 
        if [ -n "$IRCSPAM" ]; then
-               pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+               pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
        fi
        t0=`date +%s`
        (
                cd maps
-               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+               sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
+               if [ -n "$sz" ]; then
+                       minimap_override="-minimap + -minmax ${sz#size }"
+               else
+                       minimap_override=
+               fi
+               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log"
        )
        t1=`date +%s`
        dt=$(($t1 - $t0))
        status=$?
        if [ -n "$IRCSPAM" ]; then
-               cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
+               cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$status" "$dt" > "maps/$M.irc"
        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!
@@ -198,15 +204,11 @@ screenshotthemap()
        url=$2
        M=$3
        blobhash=$4
-       HASH=$5
+       commithash=$5
        if HEAD "$url$M-$blobhash/"; then
                continue
        fi
 
-       git reset --hard
-       git clean -xfd
-       git checkout -f "$HASH"
-
        rm -rf ~/.xonotic
        (
                cd ../..
@@ -218,14 +220,14 @@ screenshotthemap()
        )
        if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
                if [ -n "$IRCSPAM" ]; then
-                       #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
-                       ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
+                       #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
+                       ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
                fi
                return 1
        fi
        if [ -n "$IRCSPAM" ]; then
-               #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
-               ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
+               #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+               ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
        fi
        chmod 1777 "$M-$blobhash"
        ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
@@ -243,7 +245,7 @@ getthemap()
        bspdir=$3
        M=$4
        blobhash=$5
-       HASH=$6
+       commithash=$6
        if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
                continue
        fi
@@ -268,8 +270,8 @@ indexthemap()
        REFNAME=$1
        M=$2
        blobhash=$3
-       HASH=$4
-       echo "$M $blobhash $HASH $REFNAME"
+       commithash=$4
+       echo "$M $blobhash $commithash $REFNAME"
 }
 
 rundownload()
@@ -280,9 +282,7 @@ rundownload()
                        mv "$b" "$bspdir.old"/
                fi
        done
-       cd data/xonotic-maps.pk3dir
        allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
-       cd ../..
 }
 
 branches()
@@ -321,14 +321,16 @@ case "$1" in
                                continue
                        fi
 
+                       git reset --hard
+                       git clean -xfd
+                       git checkout -f "$HASH"
+
                        rundownload
                        if $getthemap_fail; then
                                continue
                        fi
 
-                       cd data/xonotic-maps.pk3dir
                        allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
-                       cd ../..
 
                        touch "$screenshot_cachedir/$HASH"
                done