better solution: avoid ogg->ogg bitrate reduction in release builds, but continue...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ccef520dbbff93828f1f014da198ca40418ac016..041969524ee46bc469ac18c12ebb61c8adcdbb36 100755 (executable)
--- a/all
+++ b/all
@@ -1198,7 +1198,7 @@ case "$cmd" in
 
                if [ x"$USE_GDB" = x"yes" ]; then
                        set -- gdb --args "$@"
-               elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+               elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
                        set -- gdb --batch -x savecore.gdb --args "$@"
                elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"
@@ -1788,7 +1788,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+               verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
@@ -1802,7 +1802,8 @@ case "$cmd" in
                verbose export jpeg_qual_rgb=97
                verbose export jpeg_qual_a=99
                verbose export do_dds=false
-               verbose export do_ogg=false
+               verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
@@ -1818,6 +1819,7 @@ case "$cmd" in
                verbose export do_dds=true
                verbose export dds_flags=
                verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
@@ -1952,7 +1954,7 @@ case "$cmd" in
                release_timereport "processed data"
                verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                release_timereport "transformed data"
-               find . -type f -size +4k | verbose misc/tools/symlink-deduplicate.sh
+               find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh
                release_timereport "deduplicated data"
                verbose mkzipr "../../$dst" *
                release_timereport "zipped data"