Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / all

diff --git a/all b/all
index e9e279b672ae1f909e37ceef2725121b3fd03291..02fb854c67df82aa49699e2ea2e2abca590beea7 100755 (executable)
--- a/all
+++ b/all
@@ -498,13 +498,16 @@ case "$cmd" in
                                allow_pull=false
                        elif [ x"$1" = x"-p" ]; then
                                fix_config=true
-                               if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
-                                       pushbase=ssh://xonotic@git.xonotic.org/
-                               fi
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ps" ]; then
+                               fix_config=true
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ph" ]; then
+                               fix_config=true
+                               pushbase=http://git.xonotic.org/login/xonotic/
                        elif [ x"$1" = x"-s" ]; then
                                fix_config=true
                                base=ssh://xonotic@git.xonotic.org/
-                               pushbase=
                        elif [ x"$1" = x"-g" ]; then
                                fix_config=true
                                base=git://git.xonotic.org/xonotic/
@@ -549,7 +552,7 @@ case "$cmd" in
                        best)
                                # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
                                case "$base" in
-                                       ssh://*)
+                                       ssh://*|*/login/*)
                                                pushbase=$base
                                                base=git://git.xonotic.org/xonotic/
                                                ;;
@@ -1156,6 +1159,13 @@ case "$cmd" in
                ;;
        admin-merge)
                branch=$1
+               only_delete=false
+               case "$branch" in
+                       -d)
+                               branch=
+                               only_delete=true
+                               ;;
+               esac
                t=`mktemp`
                report=""
                reportecho()
@@ -1233,6 +1243,8 @@ case "$cmd" in
                                                        git push origin :"${ref#refs/remotes/origin/}"
                                                        reportecho4 "--> branch deleted"
                                                fi
+                                       elif $only_delete; then
+                                               reportecho4 "--> skipped in delete-only run"
                                        elif [ -z "$branch" ] && [ -n "$note" ]; then
                                                reportdo4 $ECHO "$note"
                                                reportecho4 "--> not merging, already had this one rejected before"
@@ -1661,7 +1673,7 @@ case "$cmd" in
                ;;
        release-qc)
                verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-               verbose rm -f Xonotic/source/*/fteqcc.log
+               verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
                dir=$1
@@ -1671,10 +1683,9 @@ case "$cmd" in
                verbose cd "$dir"
                # texture: convert to jpeg and dds
                verbose export do_jpeg=true
-               verbose export jpeg_qual_rgb=95
+               verbose export jpeg_qual_rgb=97
                verbose export jpeg_qual_a=99
-               verbose export do_dds=true
-               verbose export dds_flags=
+               verbose export do_dds=false
                verbose export do_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
@@ -1815,11 +1826,12 @@ case "$cmd" in
                done
                ;;
        release-pack)
-               verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
-               verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal ''            low '-low' lowdds '-lowdds' normaldds '-normaldds'
-               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal ''            low '-low' lowdds '-lowdds' normaldds '-normaldds'
-               verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                raw ''     low '-low'
-               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
+               verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir                  raw ''
+               verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir                     raw ''
+               verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '-high'        low '-low' normaldds ''
+               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '-high'        low '-low' normaldds ''
+               verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                     raw '' low '-low'
+               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  normal '-high'                   normaldds ''
                ;;
        release-pack-needsx11)
                case "$DISPLAY" in
@@ -1871,17 +1883,12 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-data-low.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-low.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
-               verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-normaldds.zip
-               verbose mkzip0 Xonotic-$stamp-normaldds.zip \
-                       Xonotic/data/xonotic-$stamp-data-normaldds.pk3 \
-                       Xonotic/data/xonotic-$stamp-maps-normaldds.pk3 \
+               verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+               verbose mkzip0 Xonotic-$stamp-high.zip \
+                       Xonotic/data/xonotic-$stamp-data-high.pk3 \
+                       Xonotic/data/xonotic-$stamp-maps-high.pk3 \
                        Xonotic/data/xonotic-$stamp-music.pk3 \
-                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
-               verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
-               verbose mkzip0 Xonotic-$stamp-lowdds.zip \
-                       Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
-                       Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
-                       Xonotic/data/xonotic-$stamp-music-low.pk3
+                       Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
                ;;
        release)
                verbose "$SELF" release-prepare