X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=9e218f8f12f54d34eb264b4bd42e700402131d93;hp=5e0115a960ef3b8da541ef197ee8c42a28698bf0;hb=3dbc51d6d9b3d4b3ff6fd4adb020edf4ad15254a;hpb=a543153ec5024e471397ef0aeab6534c83469491

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 5e0115a9..9e218f8f 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -4,6 +4,7 @@ set -e
 
 bspdir="$PWD/data"
 url=http://141.2.16.23/~xonotic/bsp-autobuilds/
+override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 
 bspoutdir="$HOME/public_html/bsp-autobuilds/"
 
@@ -23,28 +24,46 @@ allmaps()
 	done
 }
 
+pre2spam()
+{
+	map=$1
+	url=$2
+	branch=$3
+	hash=$4
+
+	branch=${branch##refs/heads/}
+	branch=${branch##refs/remotes/}
+	branch=${branch##origin/}
+	hash=`echo "$hash" | cut -c 1-7`
+
+	echo "[$branch $hash] starting map compile of $map"
+}
+
 log2spam()
 {
 	map=$1
 	url=$2
 	branch=$3
 	hash=$4
+	status=$5
+	time=$6
+
+	hash=`echo "$hash" | cut -c 1-7`
 
 	branch=${branch##refs/heads/}
 	branch=${branch##refs/remotes/}
 	branch=${branch##origin/}
 
-	s_time=
 	s_samplesize=
 	s_failshaders=
 	s_leaked=
 	s_error=
 
+	if [ "$status" -ne 0 ]; then
+		s_error="exited with status $status"
+	fi
 	while IFS= read -r L; do
 		case "$L" in
-			*\ seconds\ elapsed)
-				s_time=$(($s_time + ${L%% seconds elapsed}))
-				;;
 			WARNING:\ surface\ at\ *\ too\ large\ for\ desired\ samplesize*)
 				s=${L##* }
 				if [ -z "$s_samplesize" ] || [ "$s" -gt "$s_samplesize" ]; then
@@ -68,11 +87,11 @@ log2spam()
 	s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"`
 	s_failshaders=${s_failshaders# }
 	if [ -n "$s_error" ]; then
-		echo -n "[$branch] 4failed"
+		echo -n "[$branch $hash] 4failed"
 	else
-		echo -n "[$branch] finished"
+		echo -n "[$branch $hash] finished"
 	fi
-	echo -n " map compile of $map ($url): $s_time sec"
+	echo -n " map compile of $map ($url): $time sec"
 	if [ -n "$s_samplesize" ]; then
 		echo -n ", FIX samplesize >= $s_samplesize"
 	fi
@@ -103,14 +122,24 @@ buildthemap()
 	if [ -f "$bspdir/$M-$blobhash.pk3" ]; then
 		continue
 	fi
+	if [ -n "$IRCSPAM" ]; then
+		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+	fi
+	t0=`date +%s`
 	(
 		cd maps
-		../../../misc/tools/xonotic-map-compiler "$M" `head -n 1 "$M.map.options"` 2>&1 | tee "$M.log"
+		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $override > "$M.log"
 	)
-	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
+	t1=`date +%s`
+	dt=$(($t1 - $t0))
+	status=$?
+	if [ -n "$IRCSPAM" ]; then
+		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
+	fi
+	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
 	ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!
 	if [ -n "$IRCSPAM" ]; then
-		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+		$IRCSPAM < "maps/$M.irc"
 	fi
 }
 
@@ -125,14 +154,16 @@ getthemap()
 		continue
 	fi
 	if ! wget -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"
-		return 1
+		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"
+			return 0
+		fi
 	fi
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then
 		rm -f "$bspdir/$M-$blobhash.pk3"
 		echo "WARNING: could not download $url$M-$blobhash.pk3, invalid zip file"
-		return 1
+		return 0
 	fi
 }
 
@@ -144,15 +175,18 @@ case "$1" in
 		git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
 			git reset --hard
 			git clean -xfd
-			git checkout "$HASH"
+			git checkout -f "$HASH"
 			allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir"
 		done
-		git checkout master
+		git checkout -f master
 		;;
 	download)
-		rm -rf "$bspdir.old"
 		mkdir -p "$bspdir" "$bspdir.old"
-		mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
+		for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+			if [ -e "$b" ]; then
+				mv "$b" "$bspdir.old"/
+			fi
+		done
 		cd data/xonotic-maps.pk3dir
 		allmaps getthemap "$url" "$bspdir.old" "$bspdir"
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
@@ -165,6 +199,6 @@ case "$1" in
 		wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest"
 		;;
 	log2spam-test)
-		log2spam "mapname" "http://mapurl" "branch" "commit"
+		log2spam "mapname" "http://mapurl" "branch" "commit" "0"
 		;;
 esac