X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=90a012325b829c864083833b20f87292821e07db;hp=0febde397344478db6fe0c51ee5bfe5d10958914;hb=600285e93c924f3bfc482dee2c4990768c05cd79;hpb=94ce252c0a5547d0462c4964d3282e0fc0e0d1c0

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 0febde39..90a01232 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,9 +3,10 @@
 set -e
 
 bspdir="$PWD/data"
-url=http://141.2.16.23/~xonotic/bsp-autobuilds/
-
-bspoutdir="$HOME/public_html/bsp-autobuilds/"
+url=http://beta.xonotic.org/autobuild-bsp/
+url_ssh=xonotic-beta:autobuild-bsp/
+cachedir="$HOME/xonotic-map-compiler.cache/"
+override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
 
 allmaps()
 {
@@ -45,12 +46,14 @@ log2spam()
 	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=
@@ -61,9 +64,6 @@ log2spam()
 	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
@@ -91,7 +91,7 @@ log2spam()
 	else
 		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
@@ -116,24 +116,34 @@ buildthemap()
 	REFNAME=$1
 	HASH=$2
 	url=$3
-	bspdir=$4
-	M=$5
-	blobhash=$6
-	if [ -f "$bspdir/$M-$blobhash.pk3" ]; then
+	M=$4
+	blobhash=$5
+	if HEAD "$url$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" `grep ^- "$M.map.options" | cut -d '#' -f 1` 2>&1 | tee "$M.log"
+		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $override > "$M.log"
 	)
+	t1=`date +%s`
+	dt=$(($t1 - $t0))
 	status=$?
-	zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "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" "$status" | $IRCSPAM
+		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
+	fi
+	zip -9r "$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" "$M.pk3" # from ALL branches, so beware!
+	cp "$M-$blobhash.pk3" "$M-full-$blobhash.pk3"
+	zip -9r "$M-full-$blobhash.pk3" `git diff --name-only --diff-filter=ACMRTUXB master...HEAD` || true
+	ln -snf "../$M-full-$blobhash.pk3" "$M-full.pk3" # from ALL branches, so beware!
+	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"
 	fi
 }
 
@@ -148,33 +158,41 @@ 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
 }
 
 case "$1" in
 	build)
-		mkdir -p "$bspoutdir"
-		mkdir -p "$bspoutdir/latest"
 		cd data/xonotic-maps.pk3dir
 		git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+			if [ -f "$cachedir/$HASH" ]; then
+				continue
+			fi
 			git reset --hard
 			git clean -xfd
-			git checkout "$HASH"
-			allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir"
+			git checkout -f "$HASH"
+			allmaps buildthemap "$REFNAME" "$HASH" "$url"
+			touch "$cachedir/$HASH"
 		done
-		git checkout master
+		git checkout -f master
 		;;
 	download)
 		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:"