From 4aad27834b87b7e45d252c42ccaeceed086952d7 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 30 May 2021 23:11:27 +0200 Subject: [PATCH] Remove the -low autobuild. It's confusing to some users, as it does not actually have better performancer (may even use more RAM and take longer to load). It was meant to be a lower _size_ build only. But nowadays there is little demand for that. Instead, redirect users to the regular build. --- misc/tools/all/release.subr | 59 ++----------------- .../rsync-updater/update-to-autobuild.bat | 9 ++- .../rsync-updater/update-to-autobuild.sh | 9 ++- .../tools/rsync-updater/update-to-release.bat | 9 ++- misc/tools/rsync-updater/update-to-release.sh | 9 ++- 5 files changed, 28 insertions(+), 67 deletions(-) diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index 6829fb34..960b0441 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -300,51 +300,6 @@ case "$cmd" in verbose export del_src=true find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh ;; - release-buildpk3-transform-low) - release_common - dir=$1 - verbose cd "$dir" - # texture: convert to jpeg and dds - # music: reduce bitrate - verbose export do_jpeg=true - verbose export jpeg_qual_rgb=80 - verbose export jpeg_qual_a=97 - verbose export do_dds=false - verbose export do_ogg=true - verbose export ogg_qual=1 - verbose export del_src=true - find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh - ;; - release-buildpk3-transform-webp) - release_common - dir=$1 - verbose cd "$dir" - # texture: convert to jpeg and dds - verbose export do_jpeg=false - verbose export do_webp=true - verbose export do_dds=false - verbose export do_ogg=false - verbose export ogg_ogg=false - verbose export del_src=true - find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh - ;; - release-buildpk3-transform-lowdds) - release_common - dir=$1 - verbose cd "$dir" - # texture: convert to jpeg and dds - # music: reduce bitrate - verbose export do_jpeg=false - verbose export do_jpeg_if_not_dds=true - verbose export jpeg_qual_rgb=80 - verbose export jpeg_qual_a=99 - verbose export do_dds=true - verbose export dds_flags= - verbose export do_ogg=true - verbose export ogg_qual=1 - verbose export del_src=true - find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh - ;; release-buildpk3-transform-mapping) release_common dir=$1 @@ -481,10 +436,10 @@ case "$cmd" in release_common verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir raw '' verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' - verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir low '-low' normaldds '' normal '-high' - verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir low '-low' normaldds '' mapping '-mapping' normal '-high' - verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' - verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '-low' normaldds '' normal '-high' + verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normaldds '' normal '-high' + 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' ;; release-pack-needsx11) release_common @@ -541,12 +496,6 @@ case "$cmd" in Xonotic/data/xonotic-$pk3stamp-maps.pk3 \ Xonotic/data/xonotic-$pk3stamp-music.pk3 \ Xonotic/data/xonotic-$pk3stamp-nexcompat.pk3 - verbose cp Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-low$suffix.zip - verbose mkzip0 Xonotic-$stamp-low$suffix.zip \ - Xonotic/data/xonotic-$pk3stamp-data-low.pk3 \ - Xonotic/data/xonotic-$pk3stamp-maps-low.pk3 \ - Xonotic/data/xonotic-$pk3stamp-music-low.pk3 \ - Xonotic/data/xonotic-$pk3stamp-nexcompat-low.pk3 verbose mv Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-high$suffix.zip verbose mkzip0 Xonotic-$stamp-high$suffix.zip \ Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \ diff --git a/misc/tools/rsync-updater/update-to-autobuild.bat b/misc/tools/rsync-updater/update-to-autobuild.bat index 498e2afd..1fb8b2e2 100755 --- a/misc/tools/rsync-updater/update-to-autobuild.bat +++ b/misc/tools/rsync-updater/update-to-autobuild.bat @@ -24,7 +24,8 @@ if exist ..\..\..\.git goto xonoticdatagit if exist ..\..\..\data goto xonoticdata goto xonotic :xonoticlow - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ set target=Xonotic-low/ goto endxonotic :xonotichigh @@ -51,10 +52,12 @@ goto xonotic echo FATAL: unrecognized Xonotic build. This update script cannot be used. goto end :xonoticdatalow - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ goto endxonoticdata :xonoticdatalowfuzzy - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ set options=%options% -y goto endxonoticdata :xonoticdatahigh diff --git a/misc/tools/rsync-updater/update-to-autobuild.sh b/misc/tools/rsync-updater/update-to-autobuild.sh index 294af5d7..bd1c6fc9 100755 --- a/misc/tools/rsync-updater/update-to-autobuild.sh +++ b/misc/tools/rsync-updater/update-to-autobuild.sh @@ -28,7 +28,8 @@ esac options="-Prtzil --executability --delete-after --delete-excluded --stats" if [ -d "Xonotic-low" ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" target="Xonotic-low/" elif [ -d "Xonotic-high" ]; then url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/" @@ -38,9 +39,11 @@ elif [ -d "../../../.git" ]; then exec ../../../all update elif [ -d "../../../data" ]; then if [ -f ../../../data/xonotic-rsync-data-low.pk3 ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" elif [ -f ../../../data/xonotic-*-data-low.pk3 ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" options="$options -y" # use fuzzy matching because file names differ elif [ -f ../../../data/xonotic-rsync-data-high.pk3 ]; then url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/" diff --git a/misc/tools/rsync-updater/update-to-release.bat b/misc/tools/rsync-updater/update-to-release.bat index 498e2afd..10126a6a 100755 --- a/misc/tools/rsync-updater/update-to-release.bat +++ b/misc/tools/rsync-updater/update-to-release.bat @@ -24,7 +24,8 @@ if exist ..\..\..\.git goto xonoticdatagit if exist ..\..\..\data goto xonoticdata goto xonotic :xonoticlow - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ set target=Xonotic-low/ goto endxonotic :xonotichigh @@ -51,10 +52,12 @@ goto xonotic echo FATAL: unrecognized Xonotic build. This update script cannot be used. goto end :xonoticdatalow - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ goto endxonoticdata :xonoticdatalowfuzzy - set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/ + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/ set options=%options% -y goto endxonoticdata :xonoticdatahigh diff --git a/misc/tools/rsync-updater/update-to-release.sh b/misc/tools/rsync-updater/update-to-release.sh index 294af5d7..bd1c6fc9 100755 --- a/misc/tools/rsync-updater/update-to-release.sh +++ b/misc/tools/rsync-updater/update-to-release.sh @@ -28,7 +28,8 @@ esac options="-Prtzil --executability --delete-after --delete-excluded --stats" if [ -d "Xonotic-low" ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" target="Xonotic-low/" elif [ -d "Xonotic-high" ]; then url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/" @@ -38,9 +39,11 @@ elif [ -d "../../../.git" ]; then exec ../../../all update elif [ -d "../../../data" ]; then if [ -f ../../../data/xonotic-rsync-data-low.pk3 ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" elif [ -f ../../../data/xonotic-*-data-low.pk3 ]; then - url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/" + echo NOTE: Xonotic-low is gone, downloading normal Xonotic. + url="rsync://beta.xonotic.org/$buildtype-Xonotic/" options="$options -y" # use fuzzy matching because file names differ elif [ -f ../../../data/xonotic-rsync-data-high.pk3 ]; then url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/" -- 2.39.2