./all compile-map-pk3 now compiles and compresses.

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 89e5832cf32368b27a8fa512e16b15ebc5208295..e51be4e7106ce741380b8d67301ac8732c74e6c6 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,6 +4,24 @@ case "$cmd" in
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
        compile-map)
+               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
+                       msg "q3map2 needed! Building netradiant..."
+                       make -C netradiant install/q3map2.x86
+               fi
+               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-optionsfile "$mapfile"
+                       fi
+               done
+               ;;
+       compile-map-pk3)
                if [ $# -eq 0 ] ; then
                        msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
                        msg "For example: ./all compile-map dance xoylent"
@@ -15,13 +33,14 @@ case "$cmd" in
                for mapfile in "$@"; do
                        mapname=$mapfile
                        mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
+                       mapnamezip=${mapname##*/}
+
                        if [ ! -f "$mapfile" ] ; then
                                msg "ERROR, $mapfile not found!"
                        else
-                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" 2>&1 | tee data/xonotic-maps.pk3dir/$mapname.log
+                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" 2>&1 | tee data/xonotic-maps.pk3dir/$mapnamezip.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" ../