X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=d366157d3df2f4db0f7fc70839c418ddf2e89de3;hp=194905d94270839927fc863a8ec7709c29e1d9da;hb=54d203c9b171a752a11f3e00bedb8420438b26c0;hpb=58131501bb919b974c3a90b6776eeb868546a9e8

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 194905d9..d366157d 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -8,23 +8,33 @@ url_ssh=xonotic-beta:autobuild-bsp/
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
 build_override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
-screenshot_override="9 300 +g_ctf 1"
+screenshot_override="9 600 +g_ctf 1"
 
 getthemap_fail=false
 
 allmaps()
 {
-	for F in maps/*.map.options; do
-		if ! [ -f "$F" ]; then
-			continue
-		fi
-		if ! [ -f "${F%.options}" ]; then
-			continue
-		fi
-		M=${F#maps/}
-		M=${M%.map.options}
-		blobhash=`git ls-files -s -- "$F" | cut -d ' ' -f 2`-`git ls-files -s -- "${F%.options}" | cut -d ' ' -f 2`
-		"$@" "$M" "$blobhash"
+	commithash=$1
+	shift
+	for F in `git show "${commithash}:maps/"`; do
+		case "$F" in
+			*.map.options)
+				;;
+			*)
+				continue
+				;;
+		esac
+		M=${F%.map.options}
+		blobhash=`git rev-parse --revs-only "${commithash}:maps/$M.map.options" || true`-`git rev-parse --revs-only "${commithash}:maps/$M.map" || true`
+		case "$blobhash" in
+			-*)
+				;;
+			*-)
+				;;
+			*)
+				"$@" "$M" "$blobhash" "$commithash"
+				;;
+		esac
 	done
 }
 
@@ -144,26 +154,37 @@ log2spam()
 buildthemap()
 {
 	REFNAME=$1
-	HASH=$2
-	url=$3
-	M=$4
-	blobhash=$5
+	url=$2
+	M=$3
+	blobhash=$4
+	commithash=$5
 	if HEAD "$url$M-$blobhash.pk3"; then
 		continue
 	fi
+
+	git reset --hard
+	git clean -xfd
+	git checkout -f "$commithash"
+
 	if [ -n "$IRCSPAM" ]; then
-		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+		pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
 	fi
 	t0=`date +%s`
 	(
 		cd maps
-		../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+		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"
 	)
 	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"
+		cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$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!
@@ -180,13 +201,14 @@ buildthemap()
 screenshotthemap()
 {
 	REFNAME=$1
-	HASH=$2
-	url=$3
-	M=$4
-	blobhash=$5
+	url=$2
+	M=$3
+	blobhash=$4
+	commithash=$5
 	if HEAD "$url$M-$blobhash/"; then
 		continue
 	fi
+
 	rm -rf ~/.xonotic
 	(
 		cd ../..
@@ -198,15 +220,17 @@ screenshotthemap()
 	)
 	if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
 		if [ -n "$IRCSPAM" ]; then
-			ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
+			#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" "$HASH" 0 > "maps/$M.ircss"
+		#ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+		ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
 	fi
+	chmod 1777 "$M-$blobhash"
 	ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
-	chmod -R 1777 "$M"
 	rsync -vaSHP "$M-$blobhash" "$url_ssh"
 	rsync -vaSHP "$M" "$url_ssh""latest/"
 	if [ -n "$IRCSPAM" ]; then
@@ -221,6 +245,7 @@ getthemap()
 	bspdir=$3
 	M=$4
 	blobhash=$5
+	commithash=$6
 	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
 		continue
 	fi
@@ -240,69 +265,86 @@ getthemap()
 	fi
 }
 
+indexthemap()
+{
+	REFNAME=$1
+	M=$2
+	blobhash=$3
+	commithash=$4
+	echo "$M $blobhash $commithash $REFNAME"
+}
+
+rundownload()
+{
+	mkdir -p "$bspdir" "$bspdir.old"
+	for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+		if [ -e "$b" ]; then
+			mv "$b" "$bspdir.old"/
+		fi
+	done
+	allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
+}
+
+branches()
+{
+	git for-each-ref 'refs/remotes' | grep -vE '	refs/remotes/([^/]*/HEAD|.*/archived/.*)$'
+}
+
+runmakeindex()
+{
+	cd data/xonotic-maps.pk3dir
+	branches | while read -r HASH TYPE REFNAME; do
+		allmaps "$HASH" indexthemap "$REFNAME"
+	done
+	cd ../..
+}
+
 case "$1" in
 	build)
 		cd data/xonotic-maps.pk3dir
-		git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
-			case "$REFNAME" in
-				*/archived/*)
-					continue
-					;;
-			esac
+		branches | while read -r HASH TYPE REFNAME; do
 			if [ -f "$build_cachedir/$HASH" ]; then
 				continue
 			fi
-			git reset --hard
-			git clean -xfd
-			git checkout -f "$HASH"
-			allmaps buildthemap "$REFNAME" "$HASH" "$url_http"
+			allmaps "$HASH" buildthemap "$REFNAME" "$url_http"
 			touch "$build_cachedir/$HASH"
 		done
 		git checkout -f master
 		;;
 	screenshot)
+		runmakeindex > "branches.idx.new"
+		rsync -vaSHP "branches.idx.new" "$url_ssh""branches.idx.new"
+		rm -f "branches.idx.new"
 		cd data/xonotic-maps.pk3dir
-		git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
-			case "$REFNAME" in
-				*/archived/*)
-					continue
-					;;
-			esac
+		branches | while read -r HASH TYPE REFNAME; do
 			if [ -f "$screenshot_cachedir/$HASH" ]; then
 				continue
 			fi
+
 			git reset --hard
 			git clean -xfd
 			git checkout -f "$HASH"
 
-			cd ../..
-			mkdir -p "$bspdir" "$bspdir.old"
-			for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-				if [ -e "$b" ]; then
-					mv "$b" "$bspdir.old"/
-				fi
-			done
-			cd data/xonotic-maps.pk3dir
-			allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
-
-			if ! $getthemap_fail; then
-				allmaps screenshotthemap "$REFNAME" "$HASH" "$url_http"
-				touch "$screenshot_cachedir/$HASH"
+			rundownload
+			if $getthemap_fail; then
+				continue
 			fi
+
+			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
+			touch "$screenshot_cachedir/$HASH"
 		done
 		git checkout -f master
 		;;
+	makeindex)
+		runmakeindex
+		;;
 	download)
-		mkdir -p "$bspdir" "$bspdir.old"
-		for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-			if [ -e "$b" ]; then
-				mv "$b" "$bspdir.old"/
-			fi
-		done
 		cd data/xonotic-maps.pk3dir
-		allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
+		rundownload
+		cd ../..
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
-		ls -l "$bspdir.old"
+		ls -l "$bspdir.old" || true
 		;;
 	download-latest)
 		mkdir -p "$bspdir"