X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=8379cc0222b1dc9361abdb4f50f6f763e91a15fe;hb=06d705ee7cf0d4f1f068fd62c9b58b357a9c5953;hp=0ef0c1fe2d911a42ba46cdf82a1915bdef65f974;hpb=fd313797e4b3fb8ced8f13ad4a42413b7e47e803;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 0ef0c1fe..8379cc02 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 5400 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 screenshot_override="9 900 5 +g_ctf 1"
 
 getthemap_fail=false
@@ -175,19 +175,15 @@ buildthemap()
 		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
 	fi
 	t0=`date +%s`
+	set +e
 	(
-		cd maps
-		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
+		cd ../..
+		misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-maps.pk3dir/maps/$M" $build_override > "data/xonotic-maps.pk3dir/maps/$M.log" 2>&1
 	)
 	status=$?
+	set -e
 	if ! [ -f "maps/$M.bsp" ]; then
-		echo >>"$M.log" "ERROR: No BSP file"
+		echo >>"maps/$M.log" "ERROR: No BSP file"
 	fi
 	t1=`date +%s`
 	dt=$(($t1 - $t0))
@@ -204,6 +200,9 @@ buildthemap()
 	if [ -n "$IRCSPAM" ]; then
 		$IRCSPAM < "maps/$M.irc" || true
 	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
+	fi
 }
 
 screenshotthemap()
@@ -255,6 +254,9 @@ screenshotthemap()
 	if [ -n "$IRCSPAM" ]; then
 		$IRCSPAM < "$M-$blobhash/$M.ircss" || true
 	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
+	fi
 }
 
 getthemap()