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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 262587674ad4d7b6bbf97d633ca5d02e5e0b9ace..9af8ea859741bffffc93119192d3051d374bdb93 100755 (executable)
--- a/all
+++ b/all
@@ -117,10 +117,10 @@ data/xonotic-nexcompat.pk3dir |
 darkplaces                    |                                                   | div0-stable | svn
 netradiant                    |                                                   | master      |
 div0-gittools                 |                                                   | master      | no
 darkplaces                    |                                                   | div0-stable | svn
 netradiant                    |                                                   | master      |
 div0-gittools                 |                                                   | master      | no

-d0_blind_id                   | git://github.com/divVerent/d0_blind_id.git        | master      |
+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |

 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no
 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no

-fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
+fteqcc                        | http://github.com/Blub/qclib.git                  | master      |

 "
 # todo: in darkplaces, change repobranch to div0-stable
 
 "
 # todo: in darkplaces, change repobranch to div0-stable
 


@@ -309,9 +309,11 @@ fix_git_config()
        fi
        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
        verbose git config core.autocrlf input
        fi
        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
        verbose git config core.autocrlf input

-       if [ -z "`git config push.default`" ]; then
+       if [ -z "`git config push.default || true`" ]; then

                verbose git config push.default current # or is tracking better?
        fi
                verbose git config push.default current # or is tracking better?
        fi

+       verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
+       verbose git config filter.mapclean.smudge "cat"

 }
 
 mkzip()
 }
 
 mkzip()


@@ -362,7 +364,7 @@ case "$cmd" in
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"

-                       msg "apply for access and paste the following output into the ticket:"
+                       msg "apply for access and paste the following output into the issue:"

                        msg ""
                        msg "`cat ~/.ssh/id_rsa.pub`"
                        msg ""
                        msg ""
                        msg "`cat ~/.ssh/id_rsa.pub`"
                        msg ""


@@ -377,7 +379,7 @@ case "$cmd" in
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"

-                       msg "apply for access and paste the following output into the ticket:"
+                       msg "apply for access and paste the following output into the issue:"

                        msg ""
                        msg "`cat ~/.ssh/id_dsa.pub`"
                        msg ""
                        msg ""
                        msg "`cat ~/.ssh/id_dsa.pub`"
                        msg ""


@@ -390,12 +392,12 @@ case "$cmd" in
                        msg "to specify a passphrase. Otherwise you can simply hit ENTER"
                        msg "when asked for a passphrase."
                        msg ""
                        msg "to specify a passphrase. Otherwise you can simply hit ENTER"
                        msg "when asked for a passphrase."
                        msg ""

-                       ssh-keygen -t rsa -b 4096
+                       ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa

                        msg ""
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"
                        msg ""
                        msg "To get access, your key has to be approved first. For that, visit"
                        msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on"
                        msg "the \"Support\" tracker in the \"Repository\" category where you"

-                       msg "apply for access and paste the following output into the ticket:"
+                       msg "apply for access and paste the following output into the issue:"

                        msg ""
                        msg "`cat ~/.ssh/id_rsa.pub`"
                        msg ""
                        msg ""
                        msg "`cat ~/.ssh/id_rsa.pub`"
                        msg ""


@@ -406,6 +408,7 @@ case "$cmd" in
        update|pull)
                allow_pull=true
                fix_config=false
        update|pull)
                allow_pull=true
                fix_config=false

+               location=current

                while :; do
                        if [ x"$1" = x"-N" ]; then
                                allow_pull=false
                while :; do
                        if [ x"$1" = x"-N" ]; then
                                allow_pull=false


@@ -424,11 +427,51 @@ case "$cmd" in
                        elif [ x"$1" = x"-h" ]; then
                                fix_config=true
                                base=http://git.xonotic.org/xonotic/
                        elif [ x"$1" = x"-h" ]; then
                                fix_config=true
                                base=http://git.xonotic.org/xonotic/

+                       elif [ x"$1" = x"-l" ]; then
+                               case "$2" in
+                                       nl) ;;
+                                       de) ;;
+                                       default) ;;
+                                       *)
+                                               msg "Invalid location!"
+                                               msg "Possible locations for the -l option:"
+                                               msg "  nl (Netherlands, run by merlijn)"
+                                               msg "  de (Germany, run by divVerent)"
+                                               msg "  default (currently nl)"
+                                               exit 1
+                                               ;;
+                               esac
+                               fix_config=true
+                               location=$2
+                               shift

                        else
                                break
                        fi
                        shift
                done
                        else
                                break
                        fi
                        shift
                done

+               case "$location" in
+                       default)
+                               location=
+                               ;;
+                       current)
+                               case "$base" in
+                                       *://*.git.xonotic.org/*)
+                                               location=${base%%.git.xonotic.org/*}
+                                               location=${location##*://}
+                                               ;;
+                                       *)
+                                               location=
+                                               ;;
+                               esac
+                               ;;
+               esac
+               if [ -n "$location" ]; then
+                       base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
+                       pushbase=`echo "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
+               else
+                       base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
+                       pushbase=`echo "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
+               fi

                if $fix_config; then
                        url=`repourl .`
                        pushurl=`repopushurl .`
                if $fix_config; then
                        url=`repourl .`
                        pushurl=`repopushurl .`


@@ -803,9 +846,10 @@ case "$cmd" in
 
                enter "$d0/data/xonotic-data.pk3dir" verbose
                if $cleanqc; then
 
                enter "$d0/data/xonotic-data.pk3dir" verbose
                if $cleanqc; then

-                       verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
+                       verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean

                fi
                fi

-               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+               verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+               # 4 levels up: data, xonotic-data, qcsrc, server

 
                enter "$d0/darkplaces" verbose
                if [ x"$BAD_TARGETS" = x" " ]; then
 
                enter "$d0/darkplaces" verbose
                if [ x"$BAD_TARGETS" = x" " ]; then


@@ -1122,33 +1166,33 @@ case "$cmd" in
                #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
                #   ./all clean --reclone
                found=false
                #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
                #   ./all clean --reclone
                found=false

-               while :; do
-                       if [ x"$1" = x"--reclone" ]; then
+               for X in "$@"; do
+                       if [ x"$X" = x"--reclone" ]; then

                                force=true
                                fetchupstream=true
                                gotoupstream=true
                                gotomaster=true
                                rmuntracked=true
                                killbranches=true
                                force=true
                                fetchupstream=true
                                gotoupstream=true
                                gotomaster=true
                                rmuntracked=true
                                killbranches=true

-                       elif [ x"$1" = x"-f" ]; then
+                       elif [ x"$X" = x"-f" ]; then

                                force=true
                                force=true

-                       elif [ x"$1" = x"-u" ]; then
+                       elif [ x"$X" = x"-u" ]; then

                                gotoupstream=true
                                gotoupstream=true

-                       elif [ x"$1" = x"-U" ]; then
+                       elif [ x"$X" = x"-U" ]; then

                                gotoupstream=true
                                fetchupstream=true
                                gotoupstream=true
                                fetchupstream=true

-                       elif [ x"$1" = x"-fu" ]; then
+                       elif [ x"$X" = x"-fu" ]; then

                                force=true
                                gotoupstream=true
                                force=true
                                gotoupstream=true

-                       elif [ x"$1" = x"-fU" ]; then
+                       elif [ x"$X" = x"-fU" ]; then

                                force=true
                                gotoupstream=true
                                fetchupstream=true
                                force=true
                                gotoupstream=true
                                fetchupstream=true

-                       elif [ x"$1" = x"-m" ]; then
+                       elif [ x"$X" = x"-m" ]; then

                                gotomaster=true
                                gotomaster=true

-                       elif [ x"$1" = x"-r" ]; then
+                       elif [ x"$X" = x"-r" ]; then

                                rmuntracked=true
                                rmuntracked=true

-                       elif [ x"$1" = x"-D" ]; then
+                       elif [ x"$X" = x"-D" ]; then

                                killbranches=true
                        else
                                break
                                killbranches=true
                        else
                                break


@@ -1217,6 +1261,7 @@ case "$cmd" in
                                git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
                                git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
                        fi
                                git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
                                git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
                        fi

+                       checkself "$cmd" "$@"

                done
                ;;
 
                done
                ;;
 


@@ -1441,10 +1486,11 @@ case "$cmd" in
        release-qc)
                case "$RELEASETYPE" in
                        beta)
        release-qc)
                case "$RELEASETYPE" in
                        beta)

-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+                               # back out of: source/qcsrc/server

                                ;;
                        release)
                                ;;
                        release)

-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all

                                ;;
                esac
                verbose rm -f Xonotic/source/*/fteqcc.log
                                ;;
                esac
                verbose rm -f Xonotic/source/*/fteqcc.log


@@ -1578,8 +1624,8 @@ case "$cmd" in
                ;;
        release-pack)
                verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
                ;;
        release-pack)
                verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''

-               verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
-               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
+               verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal ''            low '-low' lowdds '-lowdds'
+               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal ''            low '-low' lowdds '-lowdds'

                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/xonotic-music.pk3dir                raw ''     low '-low'
                verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
                ;;


@@ -1633,17 +1679,17 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-data-low.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-low.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
                        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-lowdds.zip
+#              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 \
                        Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
                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

-               verbose mv 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

                ;;
        release)
                verbose "$SELF" release-prepare
                ;;
        release)
                verbose "$SELF" release-prepare


@@ -1664,9 +1710,10 @@ case "$cmd" in
                echo "  $SELF checkout|switch <remote>/<branch>"
                echo "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
                echo "  $SELF clean --reclone"
                echo "  $SELF checkout|switch <remote>/<branch>"
                echo "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
                echo "  $SELF clean --reclone"

-               echo "  $SELF compile [-c]"
+               echo "  $SELF compile [-c] [-r] [-0]"

                echo "  $SELF each|foreach [-k] command..."
                echo "  $SELF fix_upstream_rebase"
                echo "  $SELF each|foreach [-k] command..."
                echo "  $SELF fix_upstream_rebase"

+               echo "  $SELF keygen"

                echo "  $SELF merge"
                echo "  $SELF push|commit [-s]"
                echo "  $SELF release"
                echo "  $SELF merge"
                echo "  $SELF push|commit [-s]"
                echo "  $SELF release"


@@ -1674,6 +1721,6 @@ case "$cmd" in
                echo "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
                echo "  $SELF save-patches"
                echo "  $SELF update-maps"
                echo "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
                echo "  $SELF save-patches"
                echo "  $SELF update-maps"

-               echo "  $SELF update|pull [-N]"
+               echo "  $SELF update|pull [-N] [-s | -h [-p] | -g [-p]] [-l de|nl|default]"

                ;;
 esac
                ;;
 esac