X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=212d0a9656cdd6137a23e13d0826bc9cbdeebc19;hp=00359af61b5a6bd66ff815ab30b120d3a6bc8cc6;hb=4c6e2486fffdf31d00e5be9a8348dd0e99247b5e;hpb=2cb95ff3d717286db24390056172f3f20a9c13f4

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 00359af6..212d0a96 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-set -ex
+set -e
 
-bspdir="$PWD/bspfiles"
+bspdir="$PWD/data"
 url=http://141.2.16.23/~xonotic/bsp-autobuilds/
 
 bspoutdir="$HOME/public_html/bsp-autobuilds/"
@@ -23,20 +23,121 @@ 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
+
+	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
+					s_samplesize=$s
+				fi
+				;;
+			WARNING:\ Couldn\'t\ find\ image\ for\ shader\ textures/NULL)
+				# radiant stupid
+				;;
+			WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *)
+				s_failshaders="$s_failshaders ${L##* }"
+				;;
+			'******* leaked *******')
+				s_leaked=1
+				;;
+			'************ ERROR ************')
+				IFS= read -r s_error
+				;;
+		esac
+	done
+	s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"`
+	s_failshaders=${s_failshaders# }
+	if [ -n "$s_error" ]; then
+		echo -n "[$branch $hash] 4failed"
+	else
+		echo -n "[$branch $hash] finished"
+	fi
+	echo -n " map compile of $map ($url): $s_time sec"
+	if [ -n "$s_samplesize" ]; then
+		echo -n ", FIX samplesize >= $s_samplesize"
+	fi
+	if [ -n "$s_failshaders" ]; then
+		if [ -n "`echo "$s_failshaders" | cut -d ' ' -f 4-`" ]; then
+			s_failshaders="`echo "$s_failshaders" | cut -d ' ' -f 1-3`..."
+		fi
+		echo -n ", FIX shaders $s_failshaders"
+	fi
+	if [ -n "$s_leaked" ]; then
+		echo -n ", FIX LEAK"
+	fi
+	if [ -n "$s_error" ]; then
+		s_error=`echo "$s_error" | sed "s,$PWD/\?,,g"`
+		echo -n ", ERROR: $s_error"
+	fi
+	echo
+}
+
 buildthemap()
 {
-	bspdir=$1
-	M=$2
-	blobhash=$3
+	REFNAME=$1
+	HASH=$2
+	url=$3
+	bspdir=$4
+	M=$5
+	blobhash=$6
 	if [ -f "$bspdir/$M-$blobhash.pk3" ]; then
 		continue
 	fi
+	if [ -n "$IRCSPAM" ]; then
+		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+	fi
 	(
 		cd maps
-		../../../misc/tools/xonotic-map-compiler "$M" -noshaderlist `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` 2>&1 | tee "$M.log"
 	)
-	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
+	status=$?
+	if [ -n "$IRCSPAM" ]; then
+		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" > "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
+		$IRCSPAM < "maps/$M.irc"
+	fi
 }
 
 getthemap()
@@ -46,7 +147,7 @@ getthemap()
 	bspdir=$3
 	M=$4
 	blobhash=$5
-	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-blobhash.pk3"; then
+	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
 		continue
 	fi
 	if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
@@ -70,14 +171,13 @@ case "$1" in
 			git reset --hard
 			git clean -xfd
 			git checkout "$HASH"
-			allmaps buildthemap "$bspoutdir"
+			allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir"
 		done
 		git checkout master
 		;;
 	download)
-		rm -rf "$bspdir.old"
-		mv "$bspdir" "$bspdir.old" || true
-		mkdir -p "$bspdir"
+		mkdir -p "$bspdir" "$bspdir.old"
+		mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
 		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:"
@@ -87,6 +187,9 @@ case "$1" in
 		mkdir -p "$bspdir"
 		cd "$bspdir"
 		rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3
-		wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url/latest"
+		wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest"
+		;;
+	log2spam-test)
+		log2spam "mapname" "http://mapurl" "branch" "commit" "0"
 		;;
 esac