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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ebe505eab9e188f2009ef512602f842291436364..f37a17f629c4cc5612daa5f3cc8bb1eabecd8e7d 100755 (executable)
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
        r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+       r_bra=${r_bra#refs/heads/}
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                        return
@@ -394,11 +395,11 @@ bestmirror()
                m=$pre$in$suf
                if t=`mirrorspeed "$m"`; then
                        if [ -n "$t" ]; then
-                               t=$(($t$op)) # fudge factor
-                               msg "$m -> $t ticks ($op)"
-                               if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+                               tt=$(($t$op)) # fudge factor
+                               msg "$m -> $t$op = $tt ticks"
+                               if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
                                        bestin=$in
-                                       bestt=$t
+                                       bestt=$tt
                                fi
                        else
                                msg "$m -> error"
@@ -536,8 +537,23 @@ case "$cmd" in
                        fi
                        shift
                done
+               case "$location" in
+                       current)
+                               if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
+                                       git config xonotic.all.mirrorselection done
+                                       location=best
+                               fi
+                               ;;
+               esac
                case "$location" in
                        best)
+                               # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+                               case "$base" in
+                                       ssh://*)
+                                               pushbase=$base
+                                               base=git://git.xonotic.org/xonotic/
+                                               ;;
+                               esac
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)
@@ -1421,13 +1437,7 @@ case "$cmd" in
        release-prepare)
                #"$SELF" each git clean -fxd
                case "$RELEASETYPE" in
-                       beta)
-                               msg "Building a BETA"
-                               ;;
-                       release)
-                               msg "Building a RELEASE"
-                               ;;
-                       *)
+                       '')
                                $ECHO >&2 -n "$ESC[2J$ESC[H"
                                msg ""
                                msg ""
@@ -1469,6 +1479,12 @@ case "$cmd" in
                                #   (YYYYMMDD)
                                exit 1
                                ;;
+                       release)
+                               msg "Building a FINISHED RELEASE"
+                               ;;
+                       *)
+                               msg "Building a $RELEASETYPE"
+                               ;;
                esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
@@ -1636,15 +1652,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               case "$RELEASETYPE" in
-                       beta)
-                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-                               # back out of: source/qcsrc/server
-                               ;;
-                       release)
-                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
-                               ;;
-               esac
+               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
@@ -1725,8 +1733,10 @@ case "$cmd" in
                        patch=$(($gv - $major * 10000 - $minor * 100))
                        versionstr="$major.$minor.$patch"
                        case "$RELEASETYPE" in
-                               beta)
-                                       versionstr="$versionstr""beta"
+                               release)
+                                       ;;
+                               *)
+                                       versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
                        verbose sed -i "
@@ -1734,6 +1744,13 @@ case "$cmd" in
                                s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
                        " defaultXonotic.cfg
+                       case "$RELEASETYPE" in
+                               release)
+                                       echo "" >> defaultXonotic.cfg
+                                       echo "// nicer menu" >> defaultXonotic.cfg
+                                       echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+                                       ;;
+                       esac
                        (
                                verbose cd gfx/menu/luminos
                                verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
@@ -1831,12 +1848,6 @@ 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-high.zip
-#              verbose mkzip0 Xonotic-$stamp-high.zip \
-#                      Xonotic/data/xonotic-$stamp-data-raw.pk3 \
-#                      Xonotic/data/xonotic-$stamp-maps-raw.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 \