oops, these files shouldn't have been deleted

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 38b65d5c062991b625271569c48fbe43ef624b8e..15a6a150d3e22c406edc8baa1d5ef6f695620490 100755 (executable)
--- a/all
+++ b/all
@@ -213,10 +213,6 @@ case "$cmd" in
                                        enter "$d0/$d" verbose
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-                                               # TODO remove this line later
-
-                                       verbose git config core.autocrlf false
-                                       verbose git config core.safecrlf false # we don't NEED that...
 
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
@@ -237,7 +233,9 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               verbose git checkout "$branch"
+                               if [ "$branch" != "master" ]; then
+                                       verbose git checkout --track -b "$branch" origin/"$branch"
+                               fi
                                cd "$d0"
                        fi
                done
@@ -306,8 +304,9 @@ case "$cmd" in
                                                        verbose git fetch origin || true
                                                fi
                                                # TODO do this without pushing
-                                               verbose git push "$remote" "$b":"$branch"
-                                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                                               verbose git checkout -b "$branch" "$b"
+                                               verbose git config "branch.$branch.remote" "$remote"
+                                               verbose git config "branch.$branch.merge" "refs/heads/$branch"
                                        fi
                                fi
                                cd "$d0"
@@ -413,7 +412,12 @@ case "$cmd" in
                                fi
                        fi
                        rem=`git config "branch.$r.remote" || echo origin`
-                       if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
+                       bra=`git config "branch.$r.merge" || echo "$r"`
+                       upstream="$rem/$bra"
+                       if ! [ git rev-parse "$upstream" ]; then
+                               upstream="`repobranch "$d"`"
+                       fi
+                       if git log "$upstream".."$r" | grep .; then
                                if yesno "Push \"$r\" in $dv?"; then
                                        verbose git push "$rem" HEAD
                                fi
@@ -421,7 +425,7 @@ case "$cmd" in
                        if [ x"$submit" = x"-s" ]; then
                                case "$r" in
                                        */*)
-                                               verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+                                               verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
                                                ;;
                                esac
                        fi
@@ -431,6 +435,12 @@ case "$cmd" in
        compile)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
+                       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
+                       # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
+                       TARGETS="sv-debug sdl-debug"
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
@@ -497,7 +507,7 @@ case "$cmd" in
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
-                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
                        client=-sdl
                else
                        client=-sdl
@@ -523,7 +533,7 @@ case "$cmd" in
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
                # if pulseaudio is running: USE IT
-               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
+               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
                        if ps -C pulseaudio >/dev/null; then
                                if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
                                        export SDL_AUDIODRIVER=pulse
@@ -648,10 +658,11 @@ case "$cmd" in
                }
                for d in $repos; do
                        enter "$d0/$d" verbose
+                       base="`repobranch "$d"`"
                        reportecho "In $d:"
                        for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
                                case "${ref#refs/remotes/origin/}" in
-                                       "`repobranch "$d"`")
+                                       "$base")
                                                continue
                                                ;;
                                        HEAD|master)
@@ -663,8 +674,8 @@ case "$cmd" in
                                if [ -n "$note" ]; then
                                        reportdo4 echo "$note"
                                        reportecho4 "--> not merging, already had this one rejected before"
-                               elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
-                                       git checkout master
+                               elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color "$base".."$ref"; git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"; } | less -r'; then
+                                       git checkout "$base"
                                        org=`git rev-parse HEAD`
                                        if ! git merge "$ref" 2>&1 | tee "$t"; then
                                                git reset --hard "$org"
@@ -685,9 +696,11 @@ case "$cmd" in
                                        else
                                                case ",`repoflags "$d"`," in
                                                        *,svn,*)
-                                                               git pull
-                                                               git rebase -i "$org"
+                                                               # we do quite a mess here... luckily we know $org
+                                                               git pull # svn needs to be current
+                                                               git rebase -i --onto master "$org"
                                                                git svn dcommit --add-author-from
+                                                               git reset --hard "$org"
                                                                ;;
                                                        *)
                                                                git push origin HEAD