fix .gitignore

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 63784c1cdf60d431603fa54807124020b75ea314..5ec251958e7e43311d5fcca4614500ccfd3db4c0 100755 (executable)
--- a/all
+++ b/all
@@ -120,6 +120,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
 netradiant                    |                                                   | master      |
+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -138,14 +139,14 @@ esac
 
 repourl()
 {
-       t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
-       if [ -n "$t" ]; then
-               case "$t" in
+       repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+       if [ -n "$repo_t" ]; then
+               case "$repo_t" in
                        *://*)
-                               echo "$t"
+                               echo "$repo_t"
                                ;;
                        *)
-                               echo "$base$t"
+                               echo "$base$repo_t"
                                ;;
                esac
        else
@@ -159,9 +160,9 @@ repourl()
 
 repobranch()
 {
-       t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
-       if [ -n "$t" ]; then
-               echo "$t"
+       repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
+       if [ -n "$repo_t" ]; then
+               echo "$repo_t"
        else
                echo "master"
        fi
@@ -170,7 +171,6 @@ repobranch()
 repoflags()
 {
        echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
-       echo "$t"
 }
 
 repos=`for d in $repos; do
@@ -426,7 +426,7 @@ case "$cmd" in
                        if [ -z "$CC" ]; then
                                export CC=gcc
                        fi
-               elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
+               elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then
                        # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
                        TARGETS="sv-debug sdl-debug"
                else
@@ -451,20 +451,23 @@ case "$cmd" in
                                cleanqc=true # version info
                                ;;
                esac
-               case "$1" in
-                       sdl)
-                               TARGETS="sdl-debug"
-                               shift
-                               ;;
-                       glx|agl|wgl)
-                               TARGETS="cl-debug"
-                               shift
-                               ;;
-                       dedicated)
-                               TARGETS="sv-debug"
-                               shift
-                               ;;
-               esac
+               if [ -n "$1" ]; then
+                       TARGETS=
+                       for X in $1; do
+                               case "$X" in
+                                       sdl)
+                                               TARGETS="sdl-debug $TARGETS"
+                                               ;;
+                                       glx|agl|wgl)
+                                               TARGETS="cl-debug $TARGETS"
+                                               ;;
+                                       dedicated)
+                                               TARGETS="sv-debug $TARGETS"
+                                               ;;
+                               esac
+                       done
+                       shift
+               fi
                if [ -z "$MAKEFLAGS" ]; then
                        if [ -f /proc/cpuinfo ]; then
                                ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
@@ -729,6 +732,7 @@ case "$cmd" in
                                                                reportecho4 "--> test failed, postponed"
                                                        fi
                                                else
+                                                       echo "MERGING"
                                                        case ",`repoflags "$d"`," in
                                                                *,svn,*)
                                                                        # we do quite a mess here... luckily we know $org