X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=8ab0f443ac234229a0073d369b862dee4af25a67;hb=bbcbb957988ae5ae5c8ca9fe181e8c9a555b48e1;hp=bfead9912d175f0efe262804a30754372f3fda0a;hpb=541b994d584287efc35d0fa27e288054d8e17ce8;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index bfead991..8ab0f443 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -7,8 +7,8 @@ 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 1800 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
-screenshot_override="9 600 +g_ctf 1"
+build_override="-bsp_timeout 5400 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+screenshot_override="9 900 5 +g_ctf 1"
 
 getthemap_fail=false
 
@@ -163,7 +163,7 @@ buildthemap()
 	M=$3
 	blobhash=$4
 	commithash=$5
-	if HEAD "$url$M-$blobhash.pk3"; then
+	if lwp-request -m HEAD "$url$M-$blobhash.pk3"; then
 		continue
 	fi
 
@@ -172,22 +172,16 @@ buildthemap()
 	git checkout -f "$commithash"
 
 	if [ -n "$IRCSPAM" ]; then
-		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
+		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
 	fi
 	t0=`date +%s`
 	(
-		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=$?
 	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))
@@ -202,7 +196,10 @@ buildthemap()
 	rsync -vaSHP "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" "$url_ssh"
 	rsync -vaSHP "$M.pk3" "$M-full.pk3" "$url_ssh""latest/"
 	if [ -n "$IRCSPAM" ]; then
-		$IRCSPAM < "maps/$M.irc"
+		$IRCSPAM < "maps/$M.irc" || true
+	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
 	fi
 }
 
@@ -213,7 +210,7 @@ screenshotthemap()
 	M=$3
 	blobhash=$4
 	commithash=$5
-	if HEAD "$url$M-$blobhash/"; then
+	if lwp-request -m HEAD "$url$M-$blobhash/"; then
 		continue
 	fi
 
@@ -222,11 +219,12 @@ screenshotthemap()
 		continue
 	fi
 
-	rm -rf ~/.xonotic
+	rm -rf ~/.xonotic/data
+	mkdir -p ~/.xonotic/data
 	(
 		cd ../..
 		if [ -n "$DISPLAY" ]; then
-			misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
+			misc/tools/xonotic-map-screenshot "$M" $screenshot_override $DRIVERFLAGS +"scr_screenshot_name \"$M-\""
 		else
 			case "$DRIVER" in
 				gl)
@@ -237,24 +235,25 @@ screenshotthemap()
 					;;
 			esac
 		fi
-	)
-	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
-		if [ -n "$IRCSPAM" ]; then
-			#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" "$commithash" 0 > "maps/$M.ircss"
-		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+	) 2>&1 | tee ~/.xonotic/data/autoscreenshot.log
+	good=false
+	if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
+		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
+	else
+		mkdir "$M-$blobhash"
+		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
 	fi
+	mv ~/.xonotic/data/"$M.ircss" "$M-$blobhash"/
+	mv ~/.xonotic/data/autoscreenshot.log "$M-$blobhash"/
 	chmod 1777 "$M-$blobhash"
 	ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
 	rsync -vaSHP "$M-$blobhash" "$url_ssh"
 	rsync -vaSHP "$M" "$url_ssh""latest/"
 	if [ -n "$IRCSPAM" ]; then
-		$IRCSPAM < "maps/$M.ircss"
+		$IRCSPAM < "$M-$blobhash/$M.ircss" || true
+	fi
+	if [ -n "$BUILD_ONE" ]; then
+		exit
 	fi
 }
 
@@ -362,6 +361,10 @@ case "$1" in
 		runmakeindex
 		;;
 	download)
+		if ! which unzip >/dev/null 2>&1; then
+			echo "Cannot find unzip, bailing out"
+			exit 1
+		fi
 		if ! cd data/xonotic-maps.pk3dir >/dev/null 2>&1; then
 			echo "data/xonotic-maps.pk3dir does not exist, not downloading"
 			exit 0