Make the Xonotic maps no longer exempt of the sRGB requirement, now that all fulfill...

[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 7425b59b1c61b89e584fde594bf2a28451dd34af..bbcedec0ddbc6a2db0fb9056a28b3a75d488ce6f 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -7,7 +7,7 @@ url_http=http://beta.xonotic.org/autobuild-bsp/
 url_ssh=xonotic-beta:autobuild-bsp/
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
-build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 18000 -minimap_timeout 900 -scale_timeout 900 -timeout_stealing 0.75"
+build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 18000 -minimap_timeout 900 -scale_timeout 900 -timeout_stealing 0.8"
 screenshot_override="9 900 5 +g_ctf 1"
 
 getthemap_fail=false
@@ -178,38 +178,27 @@ buildthemap()
        t0=`date +%s`
 
        # It's sad that we must enforce this rule by code.
-       if grep -- '-nosRGB' "maps/$map.map.options" >/dev/null; then
+       if grep -- '-nosRGB' "maps/$M.map.options" >/dev/null; then
                is_nosrgb=true
        else
                is_nosrgb=false
        fi
        allow_build=true
-       case "$map" in
-               afterslime|dance|drain|glowplant|leave_em_behind|newtonian-nightmare|nexballarena|oilrig|red-planet|runningmanctf|runningman|space-elevator|stormkeep|techassault|xoylent)
-                       if ! $is_nosrgb; then
+       if $is_nosrgb; then
+               case "$REFNAME" in
+                       master|refs/heads/master|origin/master|refs/remotes/origin/master)
                                if [ -n "$IRCSPAM" ]; then
-                                       echo "CONGRATULATIONS: map $map does not use -nosRGB any more. Please remove the map name from the list in xonotic-map-compiler-autobuild once this is merged to master." | $IRCSPAM || true
+                                       echo "\ 34ERROR: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
                                fi
-                       fi
-                       ;;
-               *)
-                       if $is_nosrgb; then
-                               case "$REFNAME" in
-                                       master|refs/heads/master|origin/master|refs/remotes/origin/master)
-                                               if [ -n "$IRCSPAM" ]; then
-                                                       echo "\ 34ERROR: map $map uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
-                                               fi
-                                               allow_build=false
-                                               ;;
-                                       *)
-                                               if [ -n "$IRCSPAM" ]; then
-                                                       echo "\ 34WARNING:\ f map $map uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
-                                               fi
-                                               ;;
-                               esac
-                       fi
-                       ;;
-       esac
+                               allow_build=false
+                               ;;
+                       *)
+                               if [ -n "$IRCSPAM" ]; then
+                                       echo "\ 34WARNING:\ f map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
+                               fi
+                               ;;
+               esac
+       fi
 
        set +e
        $allow_build && (
@@ -288,6 +277,9 @@ screenshotthemap()
        rsync -vaSHP "$M-$blobhash" "$url_ssh"
        rsync -vaSHP "$M" "$url_ssh""latest/"
        if [ -n "$IRCSPAM" ]; then
+               # It takes about 5 minutes for the server to update.
+               sleep 360  # Cut it one more minute of slack.
+
                $IRCSPAM < "$M-$blobhash/$M.ircss" || true
        fi
        if [ -n "$BUILD_ONE" ]; then