6 # I use this in EVERY shell script ;)
11 while ! [ -f ./all ]; do
12 if [ x"`pwd`" = x"/" ]; then
13 echo "Cannot find myself."
14 echo "Please run this script with the working directory inside a Xonotic checkout."
22 # If we are on WINDOWS:
27 # Windows hates users. So this script has to copy itself elsewhere first...
29 cp "$SELF" ../all.xonotic.sh
30 export WE_HATE_OUR_USERS=1
31 exec ../all.xonotic.sh "$@"
44 if [ -x /usr/bin/md5sum ]; then
46 elif [ -x /bin/md5sum ]; then
48 elif [ -x /usr/bin/cksum ]; then
55 self=`checksum "$SELF"`
58 self_new=`checksum "$SELF"`
59 if [ x"$self" != x"$self_new" ]; then
60 msg "./all has changed."
61 if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
62 msg "Rerunning the requested operation to make sure."
63 export XONOTIC_FORBID_RERUN_ALL=1
66 msg "Please try $SELF update, and then retry your requested operation."
83 echo "the root directory"
93 if git ls-files -u | grep ' 1 '; then
95 echo "MERGE CONFLICT."
96 echo "change into the \"$1\" project directory, and then:"
97 echo "- edit the files mentioned above with your favorite editor,"
98 echo " and fix the conflicts (marked with <<<<<<< blocks)"
99 echo "- for binary files, you can select the files using"
100 echo " git checkout --ours or git checkout --theirs"
101 echo "- when done with a file, 'git add' the file"
102 echo "- when done, 'git commit'"
111 while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
122 check_mergeconflict "$1"
127 data/xonotic-data.pk3dir | | master |
128 data/xonotic-maps.pk3dir | | master |
129 data/xonotic-music.pk3dir | | master |
130 data/xonotic-nexcompat.pk3dir | | master |
131 mediasource | | master |
132 darkplaces | | div0-stable | svn
133 fteqcc | git://github.com/Blub/qclib.git | master |
134 div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master |
135 netradiant | | master |
137 # todo: in darkplaces, change repobranch to div0-stable
139 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
141 base=`git config remote.origin.url`
144 base=${base%xonotic.git}
147 echo "The main repo is not xonotic.git, what have you done?"
154 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
165 if [ x"$1" = x"." ]; then
166 echo "$base""xonotic.git"
168 echo "$base${1##*/}.git"
175 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
185 echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
189 repos=`for d in $repos; do
191 if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
196 if [ "$#" = 0 ]; then
205 if [ x"$1" = x"-N" ]; then
210 branch=`repobranch "$d"`
211 if [ -d "$d0/$d" ]; then
213 enter "$d0/$d" verbose
214 verbose git config remote.origin.url "$url"
215 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
217 r=`git symbolic-ref HEAD`
219 if git config branch.$r.remote >/dev/null 2>&1; then
220 if ! verbose git pull; then
221 check_mergeconflict "$d"
222 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
228 checkself "$cmd" "$@"
230 verbose git remote prune origin
234 verbose git clone "$url" "$d0/$d"
235 enter "$d0/$d" verbose
236 if [ "$branch" != "master" ]; then
237 verbose git checkout --track -b "$branch" origin/"$branch"
246 if [ -z "$branch" ]; then
252 enter "$d0/$d" verbose
253 if [ -z "$branch" ]; then
258 if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
260 verbose git checkout "$b"
261 elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
263 verbose git checkout --track -b "$b" "$remote/$b"
265 verbose git checkout "`repobranch "$d"`"
268 checkself "$cmd" "$@"
272 echo "The requested branch was not found in any repository."
280 if [ -z "$branch" ]; then
284 if [ -z "$branch" ]; then
287 r=`git symbolic-ref HEAD`
294 dv=`visible_repo_name "$d"`
295 enter "$d0/$d" verbose
296 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
297 echo "Already having this branch in $dv."
299 if yesno "Branch in $dv?"; then
300 if [ -n "$srcbranch" ]; then
303 b=origin/"`repobranch "$d"`"
304 verbose git fetch origin || true
306 # TODO do this without pushing
307 verbose git checkout -b "$branch" "$b"
308 verbose git config "branch.$branch.remote" "$remote"
309 verbose git config "branch.$branch.merge" "refs/heads/$branch"
321 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
324 UPSTREAM=${UPSTREAM#\[}
325 UPSTREAM=${UPSTREAM%\]}
326 UPSTREAM=${UPSTREAM%:*}
329 TEXT="$UPSTREAM $TEXT"
333 if [ x"$REV" = x"->" ]; then
336 BRANCH=${BRANCH#remotes/}
338 if [ -n "$UPSTREAM" ]; then
339 echo -n " (tracking $UPSTREAM)"
348 cd "$d0/$d" # am in a pipe, shouldn't use enter
349 git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
354 while read -r d BRANCH REV UPSTREAM TEXT; do
357 UPSTREAM=${UPSTREAM#\[}
358 UPSTREAM=${UPSTREAM%\]}
359 UPSTREAM=${UPSTREAM%:*}
362 TEXT="$UPSTREAM $TEXT"
366 if [ x"$REV" = x"->" ]; then
369 BRANCH=${BRANCH#remotes/}
370 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
371 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
372 eval "r=\$branches_repos_$ID"
374 eval "branches_repos_$ID=\$r"
376 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
377 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
378 eval "r=\$branches_repos_$ID"
385 dv=`visible_repo_name "$d"`
386 enter "$d0/$d" verbose
387 r=`git symbolic-ref HEAD`
389 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
390 # we have uncommitted changes
391 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
392 if ! verbose git merge origin/"`repobranch "$d"`"; then
393 check_mergeconflict "$d"
394 exit 1 # this should ALWAYS be fatal
404 dv=`visible_repo_name "$d"`
405 enter "$d0/$d" verbose
406 r=`git symbolic-ref HEAD`
408 if git diff HEAD | grep .; then
409 # we have uncommitted changes
410 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
411 verbose git commit -a
414 rem=`git config "branch.$r.remote" || echo origin`
415 bra=`git config "branch.$r.merge" || echo "$r"`
417 if ! [ git rev-parse "$upstream" ]; then
418 upstream="`repobranch "$d"`"
420 if git log "$upstream".."$r" | grep .; then
421 if yesno "Push \"$r\" in $dv?"; then
422 verbose git push "$rem" HEAD
425 if [ x"$submit" = x"-s" ]; then
428 verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
436 if [ -n "$WE_HATE_OUR_USERS" ]; then
437 TARGETS="sv-debug cl-debug"
438 if [ -z "$CC" ]; then
441 elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
442 # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
443 TARGETS="sv-debug sdl-debug"
445 TARGETS="sv-debug cl-debug sdl-debug"
470 if [ -z "$MAKEFLAGS" ]; then
471 if [ -f /proc/cpuinfo ]; then
472 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
473 if [ $ncpus -gt 1 ]; then
479 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
482 if [ -n "$WE_HATE_OUR_USERS" ]; then
483 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
486 enter "$d0/fteqcc" verbose
488 verbose make $MAKEFLAGS clean
490 verbose make $MAKEFLAGS
491 enter "$d0/data/xonotic-data.pk3dir" verbose
493 verbose make $MAKEFLAGS clean
495 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
496 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
497 enter "$d0/darkplaces" verbose
499 verbose make $MAKEFLAGS clean
501 for T in $TARGETS; do
502 verbose make $MAKEFLAGS "$@" "$T"
506 if [ -n "$WE_HATE_OUR_USERS" ]; then
508 export PATH="$d0/misc/buildfiles/w32:$PATH"
509 elif [ x"`uname`" = x"Darwin" ]; then
510 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
516 sdl|glx|agl|dedicated)
525 if ! [ -x "darkplaces/darkplaces$client" ]; then
526 if [ -x "darkplaces/darkplaces$client.exe" ]; then
529 echo "Client darkplaces/darkplaces$client not found, aborting"
533 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
535 # if pulseaudio is running: USE IT
536 if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
537 if ps -C pulseaudio >/dev/null; then
538 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
539 export SDL_AUDIODRIVER=pulse
544 if [ -n "$USE_GDB" ]; then
545 set -- gdb --args "$@"
551 if verbose cd "$d0/$d"; then
559 patchdir=`mktemp -d -t save-patches.XXXXXX`
561 enter "$d0/$d" verbose
562 git branch -v -v | cut -c 3- | {
564 while read -r BRANCH REV UPSTREAM TEXT; do
567 UPSTREAM=${UPSTREAM#\[}
568 UPSTREAM=${UPSTREAM%\]}
569 UPSTREAM=${UPSTREAM%:*}
573 UPSTREAM=origin/"`repobranch "$d"`"
577 if [ x"$REV" = x"->" ]; then
580 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
581 echo "$d" > "$patchdir/$i/info.txt"
582 echo "$BRANCH" >> "$patchdir/$i/info.txt"
583 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
584 echo "$TRACK" >> "$patchdir/$i/info.txt"
587 rm -rf "$patchdir/$i"
592 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
597 patchdir=`mktemp -d -t restore-patches.XXXXXX`
598 ( cd "$patchdir" && tar xvzf - ) < "$infile"
600 for P in "$patchdir"/*/info.txt; do
607 verbose git checkout HEAD^0
608 verbose git branch -D "$BRANCH"
609 if [ x"$TRACK" = x"true" ]; then
610 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
612 verbose git branch -b "$BRANCH" "$UPSTREAM"
619 if [ "$#" = 1 ]; then
620 set -- "${1%%/*}" "${1#*/}"
623 enter "$d0/$d" verbose
624 git rev-parse "$1/$2" || continue
627 git log HEAD.."$1/$2"
628 git diff HEAD..."$1/$2"
630 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
632 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
636 git reset --hard HEAD@{1}
646 report=$report"$*$LF"
651 report=$report" $*$LF"
656 o=`"$@" | sed 's/^/ /' || true`
660 enter "$d0/$d" verbose
661 base="`repobranch "$d"`"
663 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
664 case "${ref#refs/remotes/origin/}" in
672 reportecho " Branch $ref:"
673 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
674 logdata=`git log --color "$base".."$ref"`
675 diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
676 if [ -z "$logdata" ]; then
677 reportecho4 "--> not merging, no changes vs master"
678 elif [ -z "$diffdata" ]; then
679 reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
680 if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
681 git push origin :"${ref#refs/remotes/origin/}"
682 reportecho4 "--> branch deleted"
684 elif [ -n "$note" ]; then
685 reportdo4 echo "$note"
686 reportecho4 "--> not merging, already had this one rejected before"
687 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
689 org=`git rev-parse HEAD`
690 if ! git merge "$ref" 2>&1 | tee "$t"; then
691 git reset --hard "$org"
692 GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
694 reportecho4 "--> merge failed"
695 elif ! "$SELF" compile 2>&1 | tee "$t"; then
696 git reset --hard "$org"
697 GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
699 reportecho4 "--> compile failed"
700 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
701 git reset --hard "$org"
702 git notes edit "$ref"
703 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
704 reportdo4 echo "$note"
705 reportecho4 "--> test failed"
707 case ",`repoflags "$d"`," in
709 # we do quite a mess here... luckily we know $org
710 git pull # svn needs to be current
711 git rebase -i --onto master "$org"
712 git svn dcommit --add-author-from
713 git reset --hard "$org"
719 reportecho4 "--> MERGED"
720 if yesno "Delete original branch \"$ref\"?"; then
721 git push origin :"${ref#refs/remotes/origin/}"
722 reportecho4 "--> branch deleted"
726 GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
727 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
728 if [ -n "$note" ]; then
729 reportdo4 echo "$note"
730 reportecho4 "--> rejected"
732 reportecho4 "--> postponed"
740 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
746 echo " $SELF push [-s]"
747 echo " $SELF branches"
748 echo " $SELF branch [<remote>] <branchname>"
749 echo " $SELF branch <remote> <branchname> <srcbranchname>"
750 echo " $SELF checkout [<remote>] <branchname>"
751 echo " $SELF compile [-c] [<client>] <options>"
752 echo " $SELF run [<client>] <options>"
753 echo " $SELF each <command>"