Package xoncompat repo for assets from removed maps

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index 583da9de3c38d4614a4745ea96a95d2c61af7eb0..e63d3fac7a5fce3da9074d263928c2e318cd993a 100644 (file)
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -7,6 +7,7 @@ allrepos()
        "$@" data/xonotic-data.pk3dir      xonotic-data.pk3dir.git      master         ""
        "$@" data/xonotic-music.pk3dir     xonotic-music.pk3dir.git     master         ""
        "$@" data/xonotic-nexcompat.pk3dir xonotic-nexcompat.pk3dir.git master         "no"
+       "$@" data/xonotic-xoncompat.pk3dir xonotic-xoncompat.pk3dir.git master         "no"
        "$@" darkplaces                    darkplaces.git               div0-stable    "svn"
        "$@" netradiant                    netradiant.git               master         ""
        "$@" div0-gittools                 div0-gittools.git            master         "no"

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 020a9f3ee0c2cbea5532bd91a9a47e2480e91b1d..be1cc7fec8e9af252a8fac53d419329cb518a614 100644 (file)
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -542,6 +542,7 @@ case "$cmd" in
                verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             normaldds '' mapping '-mapping' normal '-high'
                verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw ''
                verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir        normaldds ''                    normal '-high'
+               verbose "$SELF" release-buildpk3s data/xonotic-xoncompat.pk3dir        normaldds ''                    normal '-high'
                ;;
        release-pack-needsx11)
                release_common
@@ -596,13 +597,15 @@ case "$cmd" in
                        Xonotic/data/xonotic-$pk3stamp-data.pk3 \
                        Xonotic/data/xonotic-$pk3stamp-maps.pk3 \
                        Xonotic/data/xonotic-$pk3stamp-music.pk3 \
-                       Xonotic/data/xonotic-$pk3stamp-nexcompat.pk3
+                       Xonotic/data/xonotic-$pk3stamp-nexcompat.pk3 \
+                       Xonotic/data/xonotic-$pk3stamp-xoncompat.pk3
                verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
                verbose mkzip0 Xonotic-$stamp-high.zip \
                        Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \
                        Xonotic/data/xonotic-$pk3stamp-maps-high.pk3 \
                        Xonotic/data/xonotic-$pk3stamp-music.pk3 \
-                       Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
+                       Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3 \
+                       Xonotic/data/xonotic-$pk3stamp-xoncompat-high.pk3
                verbose mkzip Xonotic-$stamp-mappingsupport.zip \
                        Xonotic/mapping
                verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 90815e863c61e989d931eb99d7f87dfac9414711..052379d6d051f7a08dc9d8161d431c3e1d479034 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -16,7 +16,7 @@ use File::Temp;
        our $Q3MAP2      = getcwd() . '/netradiant/build/q3map2';
 
        # General flags for q3map2 (for example -threads 4)
-       our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';
+       our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3* -fs_forbiddenpath xonotic*-xoncompat*.pk3*';
 
        # Default flags for the -bsp stage
        our $BSPFLAGS    = '-meta -maxarea -samplesize 8 -mv 1000000 -mi 6000000';