X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=0b5cd720e4671f04d8937b933df95d802f01bf1c;hb=e3f69c1240066b38f96cf54e8c8a3a90f6710202;hp=f33566d2d9ce32fe061242bad044f0a30883a46b;hpb=6cb5c2a941ccb6a7517caad14e852bdef92a02c9;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index f33566d2..0b5cd720 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 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+build_override="-bsp_timeout 1800 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 screenshot_override="9 600 +g_ctf 1"
 
 getthemap_fail=false
@@ -116,6 +116,11 @@ log2spam()
 			WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *)
 				s_failshaders="$s_failshaders ${L##* }"
 				;;
+			ERROR:\ *)
+				if [ -z "$s_error" ]; then
+					s_error=$L
+				fi
+				;;
 			'******* leaked *******')
 				s_leaked=1
 				;;
@@ -172,11 +177,20 @@ buildthemap()
 	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" 2>&1
 	)
+	status=$?
+	if ! [ -f "maps/$M.bsp" ]; then
+		echo >>"$M.log" "ERROR: No BSP file"
+	fi
 	t1=`date +%s`
 	dt=$(($t1 - $t0))
-	status=$?
 	if [ -n "$IRCSPAM" ]; then
 		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$status" "$dt" > "maps/$M.irc"
 	fi
@@ -203,13 +217,20 @@ screenshotthemap()
 		continue
 	fi
 
+	if ! unzip -l "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp"; then
+		# no BSP file
+		continue
+	fi
+
 	rm -rf ~/.xonotic
 	(
 		cd ../..
 		if [ -n "$DISPLAY" ]; then
 			misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
 		else
-			startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
+			#startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
+			#startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -gl_driver /usr/local/lib/gallium3d/libGL.so -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
+			startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
 		fi
 	)
 	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
@@ -241,9 +262,11 @@ getthemap()
 	blobhash=$5
 	commithash=$6
 	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
-		continue
+		if unzip -l "$bspdir/$M-$blobhash.pk3" >/dev/null 2>&1; then
+			return 0
+		fi
 	fi
-	if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+	if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
 		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
 			rm -f "$bspdir/$M-$blobhash.pk3"
 			echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"
@@ -334,7 +357,10 @@ case "$1" in
 		runmakeindex
 		;;
 	download)
-		cd data/xonotic-maps.pk3dir
+		if ! cd data/xonotic-maps.pk3dir; then
+			echo "data/xonotic-maps.pk3dir does not exist, not downloading"
+			exit 0
+		fi
 		rundownload
 		cd ../..
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"