From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Jun 2013 16:23:53 +0000 (+0200)
Subject: refactor map building so mapinfo size detection works too
X-Git-Tag: xonotic-v0.8.0~120
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52038b1e1ab050ac469cdb51587790beca63b1dc;p=xonotic%2Fxonotic.git

refactor map building so mapinfo size detection works too
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index ef09a530..b2ba714c 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -8,18 +8,16 @@ case "$cmd" in
 			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 			msg "For example: ./all compile-map dance xoylent"
 		fi
-		if [ ! -f "netradiant/install/q3map2.x86" ] ; then
+		if ! [ -f "netradiant/install/q3map2.x86" ] ; then
 			msg "q3map2 needed! Building netradiant..."
-			cd netradiant
-			make
-			cd ../
+			make -C netradiant install/q3map2.x86
 		fi
-		for mapfile in $@ ; do
-				mapfile="data/xonotic-maps.pk3dir/maps/$1.map"
+		for mapfile in "$@"; do
+			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
 			if [ ! -f "$mapfile" ] ; then
 				msg "ERROR, $mapfile not found!"
 			else
-				time misc/tools/xonotic-map-compiler $mapfile `grep "^-" $mapfile.options`
+				time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
 			fi
 		done
 		;;
diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index aa14ddd0..d7a3a936 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -176,14 +176,8 @@ buildthemap()
 	fi
 	t0=`date +%s`
 	(
-		cd maps
-		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" 2>&1
+		cd ../..
+		misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-data.pk3dir/maps/$M" $build_override > "$M.log" 2>&1
 	)
 	status=$?
 	if ! [ -f "maps/$M.bsp" ]; then
diff --git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile
new file mode 100755
index 00000000..1666c5bf
--- /dev/null
+++ b/misc/tools/xonotic-map-compiler-optionsfile
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+M=${1%.map}
+shift
+
+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 "$@"