From 359a3026192c6096a4cdc00d1a8d33a1875a3a03 Mon Sep 17 00:00:00 2001 From: bones_was_here <bones_was_here@xonotic.au> Date: Wed, 24 May 2023 08:37:38 +1000 Subject: [PATCH] Package xoncompat repo for assets from removed maps --- misc/tools/all/config.subr | 1 + misc/tools/all/release.subr | 7 +++++-- misc/tools/xonotic-map-compiler | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr index 583da9de..e63d3fac 100644 --- 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 020a9f3e..be1cc7fe 100644 --- 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 90815e86..052379d6 100755 --- 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'; -- 2.39.5