exists=false
for d in $repos; do
enter "$d0/$d" verbose
- if [ -z "$branch" ]; then
- b=`repobranch "$d"`
- else
- b=$branch
- fi
- if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+ b=$branch
+ if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
exists=true
verbose git checkout "$b"
- elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+ elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
exists=true
verbose git checkout --track -b "$b" "$remote/$b"
else
- verbose git checkout "`repobranch "$d"`"
+ b=`repobranch "$d"`
+ if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+ exists=true
+ verbose git checkout "$b"
+ elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+ exists=true
+ verbose git checkout --track -b "$b" "$remote/$b"
+ else
+ echo "WTF? Not even branch $b doesn't exist in $d"
+ exit 1
+ fi
fi
cd "$d00"
checkself "$cmd" "$@"
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
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
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
;;
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"
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
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"