X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=6b19347bb4e098367ebd43ca8a2796354efff388;hp=39b3b4052696f407cda0f286a46ed38278bfd740;hb=1e68844d51c6b68130cd79cfd7c4da8678f160a5;hpb=0e6755501608ae87e7ac81c6ff7c2cdc1d528875 diff --git a/all b/all index 39b3b405..6b19347b 100755 --- a/all +++ b/all @@ -118,7 +118,7 @@ netradiant | div0-gittools | | master | no data/xonotic-maps.pk3dir | | master | mediasource | | master | no -fteqcc | git://github.com/Blub/qclib.git | master | +fteqcc | http://github.com/Blub/qclib.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -666,10 +666,21 @@ case "$cmd" in fi fi + binary=$1 + if [ -n "$USE_GDB" ]; then set -- gdb --args "$@" + elif which gdb >/dev/null 2>&1; then + set -- gdb --batch -x savecore.gdb --args "$@" + elif which catchsegv >/dev/null 2>&1; then + set -- catchsegv "$@" fi + rm -f xonotic.core "$@" + if [ -f xonotic.core ]; then + echo "The program has CRASHED. Please examine the core dump in the debugger." + gdb "$binary" xonotic.core + fi ;; each|foreach) keep_going=false @@ -833,7 +844,7 @@ case "$cmd" in 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 -n 2>&1 | tee "$t"; then + 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" @@ -950,6 +961,7 @@ case "$cmd" in if $gotomaster; then if $fetchupstream; then verbose git fetch origin + verbose git remote prune origin fi verbose git checkout -f "`repobranch "$d"`" verbose git reset --hard origin/"`repobranch "$d"`" @@ -961,6 +973,7 @@ case "$cmd" in upstream="$rem/${bra#refs/heads/}" if $fetchupstream; then verbose git fetch "$rem" + verbose git remote prune "$rem" fi if ! git rev-parse "$upstream" >/dev/null 2>&1; then upstream="origin/`repobranch "$d"`"