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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index c53631dc184ca256c6f92a16b1d30f002b870114..282a69033a903d5c1672866fbb02b1c6bd489149 100755 (executable)
--- a/all
+++ b/all
@@ -335,11 +335,26 @@ case "$cmd" in
                        verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok
                done
                ;;
+       fix_config)
+               for d in $repos; do
+                       url=`repourl "$d"`
+                       pushurl=`repopushurl "$d"`
+                       branch=`repobranch "$d"`
+                       if [ -d "$d0/$d" ]; then
+                               verbose cd "$d0/$d"
+                               fix_git_config "$url" "$pushurl"
+                               cd "$d0"
+                       fi
+               done
+               ;;
        update|pull)
                allow_pull=true
                if [ x"$1" = x"-N" ]; then
                        allow_pull=false
                fi
+               if $allow_pull; then
+                       "$SELF" fix_config
+               fi
                for d in $repos; do
                        url=`repourl "$d"`
                        pushurl=`repopushurl "$d"`
@@ -347,7 +362,6 @@ case "$cmd" in
                        if [ -d "$d0/$d" ]; then
                                if $allow_pull; then
                                        enter "$d0/$d" verbose
-                                       fix_git_config "$url" "$pushurl"
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
@@ -559,38 +573,46 @@ case "$cmd" in
                done
                ;;
        compile)
+               cleandp=false
+               cleanqcc=false
+               cleanqc=false
+               debug=debug
+               while :; do
+                       case "$1" in
+                               -c)
+                                       cleandp=true
+                                       cleanqcc=true
+                                       cleanqc=true
+                                       shift
+                                       ;;
+                               -r)
+                                       debug=release
+                                       shift
+                                       ;;
+                               *)
+                                       break
+                                       ;;
+                       esac
+               done
                if [ -z "$CC" ]; then
                        export CC="gcc -DSUPPORTIPV6"
                fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       TARGETS="sv-debug cl-debug"
+                       TARGETS="sv-$debug cl-$debug"
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)
-                                       TARGETS="sv-debug cl-debug sdl-debug"
+                                       TARGETS="sv-$debug cl-$debug sdl-$debug"
                                        ;;
                                *)
                                        # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
-                                       TARGETS="sv-debug sdl-debug"
+                                       TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
                        export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
-                       TARGETS="sv-debug cl-debug sdl-debug"
+                       TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
-               case "$1" in
-                       -c)
-                               cleandp=true
-                               cleanqcc=true
-                               cleanqc=true
-                               shift
-                               ;;
-                       *)
-                               cleandp=false
-                               cleanqcc=false
-                               cleanqc=false
-                               ;;
-               esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
                        # if we give the command make the arg "", it will surely fail (invalid filename),
                        # so better handle it as an empty client option
@@ -949,6 +971,8 @@ case "$cmd" in
                echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
                ;;
        clean)
+               "$SELF" fix_config
+               "$SELF" update -N
                force=false
                gotoupstream=false
                fetchupstream=false