add IRC notification about build results

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b7f404122d551fa9c489129af5ffd3617ffb5fcd..964233c0182f704382c3e416bb141ed6cab4d147 100755 (executable)
--- a/all
+++ b/all
@@ -438,6 +438,9 @@ 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
+                       # 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
@@ -504,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-SDL.app/Contents/MacOS"
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
                        client=-sdl
                else
                        client=-sdl
@@ -530,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
@@ -667,7 +670,7 @@ case "$cmd" in
                                                ;;
                                esac
                                reportecho "  Branch $ref:"
-                               note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                if [ -n "$note" ]; then
                                        reportdo4 echo "$note"
                                        reportecho4 "--> not merging, already had this one rejected before"
@@ -676,18 +679,18 @@ case "$cmd" in
                                        org=`git rev-parse HEAD`
                                        if ! git merge "$ref" 2>&1 | tee "$t"; then
                                                git reset --hard "$org"
-                                               git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
+                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
                                                reportdo4 cat "$t"
                                                reportecho4 "--> merge failed"
                                        elif ! "$SELF" compile 2>&1 | tee "$t"; then
                                                git reset --hard "$org"
-                                               git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
+                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
                                                reportdo4 cat "$t"
                                                reportecho4 "--> compile failed"
                                        elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
                                                git reset --hard "$org"
-                                               git notes --ref "refs/notes/admin-merge" add "$ref"
-                                               note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+                                               git notes edit "$ref"
+                                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                                reportdo4 echo "$note"
                                                reportecho4 "--> test failed"
                                        else
@@ -711,7 +714,7 @@ case "$cmd" in
                                        fi
                                else
                                        git notes --ref "refs/notes/admin-merge" add "$ref"
-                                       note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+                                       note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                        if [ -n "$note" ]; then
                                                reportdo4 echo "$note"
                                                reportecho4 "--> rejected"