X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=d366157d3df2f4db0f7fc70839c418ddf2e89de3;hp=23c7dca547a7ace6dfcd407b6dd0a47d694d3a6a;hb=a5da63a912956a502a5b4ecc4292b5a779245381;hpb=588b4f1e06c595ba47ba5d663e1ac5aa707f4f9a

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 23c7dca5..d366157d 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -16,10 +16,16 @@ allmaps()
 {
 	commithash=$1
 	shift
-	for F in `git ls-files "$commithash" -- maps/\*.map.options`; do
-		M=${F#maps/}
-		M=${M%.map.options}
-		blobhash=`git rev-parse --revs-only "$commithash:maps/$M.map.options" || true`-`git rev-parse --revs-only "$commithash:maps/$M.map" || true`
+	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
 			-*)
 				;;
@@ -151,28 +157,34 @@ buildthemap()
 	url=$2
 	M=$3
 	blobhash=$4
-	HASH=$5
+	commithash=$5
 	if HEAD "$url$M-$blobhash.pk3"; then
 		continue
 	fi
 
 	git reset --hard
 	git clean -xfd
-	git checkout -f "$HASH"
+	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!
@@ -192,15 +204,11 @@ screenshotthemap()
 	url=$2
 	M=$3
 	blobhash=$4
-	HASH=$5
+	commithash=$5
 	if HEAD "$url$M-$blobhash/"; then
 		continue
 	fi
 
-	git reset --hard
-	git clean -xfd
-	git checkout -f "$HASH"
-
 	rm -rf ~/.xonotic
 	(
 		cd ../..
@@ -212,14 +220,14 @@ 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?d" "$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?d" "$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!
@@ -237,7 +245,7 @@ getthemap()
 	bspdir=$3
 	M=$4
 	blobhash=$5
-	HASH=$6
+	commithash=$6
 	if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
 		continue
 	fi
@@ -262,8 +270,8 @@ indexthemap()
 	REFNAME=$1
 	M=$2
 	blobhash=$3
-	HASH=$4
-	echo "$M $blobhash $HASH $REFNAME"
+	commithash=$4
+	echo "$M $blobhash $commithash $REFNAME"
 }
 
 rundownload()
@@ -274,9 +282,7 @@ rundownload()
 			mv "$b" "$bspdir.old"/
 		fi
 	done
-	cd data/xonotic-maps.pk3dir
 	allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
-	cd ../..
 }
 
 branches()
@@ -306,23 +312,25 @@ case "$1" in
 		git checkout -f master
 		;;
 	screenshot)
-		runmakeindex > branches.idx.new
-		rsync -vaSHP "$branches.idx.new" "$url_ssh""branches.idx.new"
-		rm -f branches.idx.new
+		runmakeindex > "branches.idx.new"
+		rsync -vaSHP "branches.idx.new" "$url_ssh""branches.idx.new"
+		rm -f "branches.idx.new"
 		cd data/xonotic-maps.pk3dir
 		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"
+
 			rundownload
 			if $getthemap_fail; then
 				continue
 			fi
 
-			cd data/xonotic-maps.pk3dir
 			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
-			cd ../..
 
 			touch "$screenshot_cachedir/$HASH"
 		done
@@ -332,7 +340,9 @@ case "$1" in
 		runmakeindex
 		;;
 	download)
+		cd data/xonotic-maps.pk3dir
 		rundownload
+		cd ../..
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
 		ls -l "$bspdir.old" || true
 		;;