X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=13a37907c5b9306a8106e8c5490750e2fbc7451c;hp=cf7e101d3472e7fd9cf697583f5b1994d7173508;hb=175a62ed4aac61e99c1a0e019c4eb7d842117ea1;hpb=4a97ea27c14abb498243ba7c487ec2b2e5c9c5b3 diff --git a/all b/all index cf7e101d..13a37907 100755 --- a/all +++ b/all @@ -3,6 +3,10 @@ set -e +# I use this in EVERY shell script ;) +LF=" +" + d00=`pwd` while ! [ -f ./all ]; do if [ x"`pwd`" = x"/" ]; then @@ -101,6 +105,17 @@ check_mergeconflict() fi } +yesno() +{ + yesno= + while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do + eval "$2" + echo "$1" + IFS= read -r yesno + done + [ x"$yesno" = x"y" ] +} + enter() { $2 cd "$1" @@ -108,28 +123,44 @@ enter() } repos_urls=" -. | | master -data/xonotic-data.pk3dir | | master -data/xonotic-maps.pk3dir | | master -data/xonotic-music.pk3dir | | master -data/xonotic-nexcompat.pk3dir | | master -darkplaces | | div0-stable -fteqcc | git://github.com/Blub/qclib.git | master -div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master -netradiant | | master +. | | master | +data/xonotic-data.pk3dir | | master | +data/xonotic-maps.pk3dir | | master | +data/xonotic-music.pk3dir | | master | +data/xonotic-nexcompat.pk3dir | | master | +mediasource | | master | +darkplaces | | div0-stable | svn +fteqcc | git://github.com/Blub/qclib.git | master | +div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master | +netradiant | | master | " # todo: in darkplaces, change repobranch to div0-stable repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '` base=`git config remote.origin.url` -base=${base%xonotic.git} +case "$base" in + */xonotic.git) + base=${base%xonotic.git} + ;; + *) + echo "The main repo is not xonotic.git, what have you done?" + exit 1 + ;; +esac repourl() { t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` if [ -n "$t" ]; then - echo "$t" + case "$t" in + *://*) + echo "$t" + ;; + *) + echo "$base$t" + ;; + esac else if [ x"$1" = x"." ]; then echo "$base""xonotic.git" @@ -149,6 +180,12 @@ repobranch() fi } +repoflags() +{ + echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' + echo "$t" +} + repos=`for d in $repos; do p="${d%dir}" if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then @@ -164,37 +201,41 @@ shift case "$cmd" in update|pull) + allow_pull=true + if [ x"$1" = x"-N" ]; then + allow_pull=false + fi for d in $repos; do url=`repourl "$d"` branch=`repobranch "$d"` if [ -d "$d0/$d" ]; then - 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... + if $allow_pull; then + enter "$d0/$d" verbose + verbose git config remote.origin.url "$url" + verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" - r=`git symbolic-ref HEAD` - r=${r#refs/heads/} - if git config branch.$r.remote >/dev/null 2>&1; then - if ! verbose git pull; then - check_mergeconflict "$d" - echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." - read -r DUMMY + r=`git symbolic-ref HEAD` + r=${r#refs/heads/} + if git config branch.$r.remote >/dev/null 2>&1; then + if ! verbose git pull; then + check_mergeconflict "$d" + echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." + read -r DUMMY + fi fi - fi - cd "$d00" - checkself "$cmd" "$@" - cd "$d0/$d" - verbose git remote prune origin - cd "$d0" + cd "$d00" + checkself "$cmd" "$@" + cd "$d0/$d" + verbose git remote prune origin + cd "$d0" + fi 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 @@ -209,12 +250,17 @@ case "$cmd" in exists=false for d in $repos; do enter "$d0/$d" verbose - if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then + if [ -z "$branch" ]; then + b=`repobranch "$d"` + else + b=$branch + fi + if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then exists=true - verbose git checkout "$branch" - elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then + verbose git checkout "$b" + elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then exists=true - verbose git checkout --track -b "$branch" "$remote/$branch" + verbose git checkout --track -b "$b" "$remote/$b" else verbose git checkout "`repobranch "$d"`" fi @@ -247,23 +293,20 @@ case "$cmd" in for d in $repos; do dv=`visible_repo_name "$d"` enter "$d0/$d" verbose - a= if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then echo "Already having this branch in $dv." else - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Branch in $dv?" - read -r a - done - if [ x"$a" = x"y" ]; then + if yesno "Branch in $dv?"; then if [ -n "$srcbranch" ]; then b=$srcbranch else - b="`repobranch "$d"`" + b=origin/"`repobranch "$d"`" + 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" @@ -345,12 +388,7 @@ case "$cmd" in r=${r#refs/heads/} if git log HEAD..origin/"`repobranch "$d"`" | grep .; then # we have uncommitted changes - a= - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?" - read -r a - done - if [ x"$a" = x"y" ]; then + if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then if ! verbose git merge origin/"`repobranch "$d"`"; then check_mergeconflict "$d" exit 1 # this should ALWAYS be fatal @@ -369,30 +407,25 @@ case "$cmd" in r=${r#refs/heads/} if git diff HEAD | grep .; then # we have uncommitted changes - a= - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Uncommitted changes in \"$r\" in $dv. Commit?" - read -r a - done - if [ x"$a" = x"y" ]; then + if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then verbose git commit -a fi fi rem=`git config "branch.$r.remote" || echo origin` - if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then - a= - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Push \"$r\" in $dv?" - read -r a - done - if [ x"$a" = x"y" ]; 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 fi 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 @@ -402,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 @@ -440,6 +479,9 @@ case "$cmd" in MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1" ;; esac + if [ -n "$WE_HATE_OUR_USERS" ]; then + MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw" + fi fi enter "$d0/fteqcc" verbose if $clean; then @@ -450,6 +492,7 @@ case "$cmd" in if $clean; then verbose make $MAKEFLAGS clean fi + verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS enter "$d0/darkplaces" verbose if $clean; then @@ -464,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 @@ -488,6 +531,16 @@ case "$cmd" in fi fi 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" ] && ! [ 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 + fi + fi + fi + if [ -n "$USE_GDB" ]; then set -- gdb --args "$@" fi @@ -495,9 +548,10 @@ case "$cmd" in ;; each|foreach) for d in $repos; do - enter "$d0/$d" verbose - verbose "$@" - cd "$d0" + if verbose cd "$d0/$d"; then + verbose "$@" + cd "$d0" + fi done ;; save-patches) @@ -573,24 +627,9 @@ case "$cmd" in git log HEAD.."$1/$2" git diff HEAD..."$1/$2" } | less - a= - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?" - read -r a - done - if [ x"$a" = x"y" ]; then + if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then git merge "$1/$2" - cd "$d0" - a= - if ! "$SELF" compile; then - a=n - fi - cd "$d0/$d" - while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first." - read -r a - done - if [ x"$a" = x"y" ]; then + if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then git push origin HEAD git push "$1" :"$2" else @@ -599,6 +638,97 @@ case "$cmd" in fi done ;; + admin-merge-2) + t=`mktemp` + report="" + reportecho() + { + report=$report"$*$LF" + echo "$*" + } + reportecho4() + { + report=$report" $*$LF" + echo " $*" + } + reportdo4() + { + o=`"$@" | sed 's/^/ /' || true` + reportecho "$o" + } + 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 + "$base") + continue + ;; + HEAD|master) + continue + ;; + esac + reportecho " Branch $ref:" + 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" + 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" + 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 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 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 + case ",`repoflags "$d"`," in + *,svn,*) + # 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 + ;; + esac + reportecho4 "--> MERGED" + if yesno "Delete original branch \"$ref\"?"; then + git push origin :"${ref#refs/remotes/origin/}" + reportecho4 "--> branch deleted" + fi + fi + else + GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref" + 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" + else + reportecho4 "--> postponed" + fi + fi + reportecho "" + done + reportecho "" + done + rm -f "$t" + echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt + ;; *) echo "Usage:" echo " $SELF pull"