X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=08c902ca90f65f8044dfe74e1cbf3cd79fbabb81;hb=e4fdb51af95849173b80317f16351a5658122ac2;hp=1c9fc7fa4e77480d12631dabee47ece17b60b2b0;hpb=fb187bb0cee595c3d0b0848aaac4592c25383e5e;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 1c9fc7fa..08c902ca 100755
--- 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
@@ -174,9 +174,49 @@ buildthemap()
 	if [ -n "$IRCSPAM" ]; then
 		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
 	fi
+
 	t0=`date +%s`
+
+	# It's sad that we must enforce this rule by code.
+	if grep -- '-nosRGB' "maps/$M.map.options" >/dev/null; then
+		is_nosrgb=true
+	else
+		is_nosrgb=false
+	fi
+	allow_build=true
+	case "$M" 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 [ -n "$IRCSPAM" ]; then
+					echo "8NOTE: map $M still uses -nosRGB. This should eventually get fixed." | $IRCSPAM || true
+				fi
+			else
+				if [ -n "$IRCSPAM" ]; then
+					echo "9CONGRATULATIONS: map $M 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
+				fi
+			fi
+			;;
+		*)
+			if $is_nosrgb; then
+				case "$REFNAME" in
+					master|refs/heads/master|origin/master|refs/remotes/origin/master)
+						if [ -n "$IRCSPAM" ]; then
+							echo "4ERROR: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
+						fi
+						allow_build=false
+						;;
+					*)
+						if [ -n "$IRCSPAM" ]; then
+							echo "4WARNING: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
+						fi
+						;;
+				esac
+			fi
+			;;
+	esac
+
 	set +e
-	(
+	$allow_build && (
 		cd ../..
 		misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-maps.pk3dir/maps/$M" $build_override > "data/xonotic-maps.pk3dir/maps/$M.log" 2>&1
 	)
@@ -212,7 +252,7 @@ screenshotthemap()
 	M=$3
 	blobhash=$4
 	commithash=$5
-	if lwp-request -m HEAD "$url$M-$blobhash/"; then
+	if lwp-request -m HEAD "$url$M-$blobhash/$M-000000.jpg"; then
 		continue
 	fi
 
@@ -252,6 +292,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