./all compile-map: generate logfile and pack into the .pk3

[xonotic/xonotic.git] / misc / tools / all / xonotic.subr

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 93c198406ce751afc1cb8cf0d982b20990ad8571..805a910397145f91836338abb06b012b9947b282 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,22 +4,28 @@ case "$cmd" in
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
        compile-map)
-               if [ -n "$1" ] ; then
+               if [ $# -eq 0 ] ; then
                        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
+                       mapname=$mapfile
+                       mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
                        if [ ! -f "$mapfile" ] ; then
                                msg "ERROR, $mapfile not found!"
                        else
-                               time misc/tools/xonotic-map-compiler_from_all $mapfile
+                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" |& tee data/xonotic-maps.pk3dir/$mapname.log
+                               cd data/xonotic-maps.pk3dir
+                               mapblobhash=`git rev-parse --revs-only "HEAD:maps/$mapname.map.options" || true`-`git rev-parse --revs-only "HEAD:maps/$mapname.map" || true`
+                               mapnamezip=${mapname##*/}
+                               echo "Compressing to .pk3..."
+                               zip -9r "$mapnamezip-$mapblobhash.pk3"  "maps/$mapname.bsp" "maps/$mapname/"  "gfx/${mapnamezip}_mini.tga" "$mapname.log"
+                               mv -f "$mapnamezip-$mapblobhash.pk3" ../
+                               verbose "$SELF" update-maps
                        fi
                done
                ;;
@@ -344,6 +350,7 @@ case "$cmd" in
                $ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
                $ECHO "  $SELF update-maps"
                $ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+               $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;
        *)