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
254 if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
256 verbose git checkout "$b"
257 elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
259 verbose git checkout --track -b "$b" "$remote/$b"
262 if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
264 verbose git checkout "$b"
265 elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
267 verbose git checkout --track -b "$b" "$remote/$b"
269 echo "WTF? Not even branch $b doesn't exist in $d"
274 checkself "$cmd" "$@"
278 echo "The requested branch was not found in any repository."
286 if [ -z "$branch" ]; then
290 if [ -z "$branch" ]; then
293 r=`git symbolic-ref HEAD`
300 dv=`visible_repo_name "$d"`
301 enter "$d0/$d" verbose
302 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
303 echo "Already having this branch in $dv."
305 if yesno "Branch in $dv?"; then
306 if [ -n "$srcbranch" ]; then
309 b=origin/"`repobranch "$d"`"
310 verbose git fetch origin || true
312 # TODO do this without pushing
313 verbose git checkout -b "$branch" "$b"
314 verbose git config "branch.$branch.remote" "$remote"
315 verbose git config "branch.$branch.merge" "refs/heads/$branch"
327 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
330 UPSTREAM=${UPSTREAM#\[}
331 UPSTREAM=${UPSTREAM%\]}
332 UPSTREAM=${UPSTREAM%:*}
335 TEXT="$UPSTREAM $TEXT"
339 if [ x"$REV" = x"->" ]; then
342 BRANCH=${BRANCH#remotes/}
344 if [ -n "$UPSTREAM" ]; then
345 echo -n " (tracking $UPSTREAM)"
354 cd "$d0/$d" # am in a pipe, shouldn't use enter
355 git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
360 while read -r d BRANCH REV UPSTREAM TEXT; do
363 UPSTREAM=${UPSTREAM#\[}
364 UPSTREAM=${UPSTREAM%\]}
365 UPSTREAM=${UPSTREAM%:*}
368 TEXT="$UPSTREAM $TEXT"
372 if [ x"$REV" = x"->" ]; then
375 BRANCH=${BRANCH#remotes/}
376 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
377 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
378 eval "r=\$branches_repos_$ID"
380 eval "branches_repos_$ID=\$r"
382 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
383 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
384 eval "r=\$branches_repos_$ID"
391 dv=`visible_repo_name "$d"`
392 enter "$d0/$d" verbose
393 r=`git symbolic-ref HEAD`
395 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
396 # we have uncommitted changes
397 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
398 if ! verbose git merge origin/"`repobranch "$d"`"; then
399 check_mergeconflict "$d"
400 exit 1 # this should ALWAYS be fatal
410 dv=`visible_repo_name "$d"`
411 enter "$d0/$d" verbose
412 r=`git symbolic-ref HEAD`
414 if git diff HEAD | grep .; then
415 # we have uncommitted changes
416 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
417 verbose git commit -a
420 rem=`git config "branch.$r.remote" || echo origin`
421 bra=`git config "branch.$r.merge" || echo "$r"`
423 if ! [ git rev-parse "$upstream" ]; then
424 upstream="`repobranch "$d"`"
426 if git log "$upstream".."$r" | grep .; then
427 if yesno "Push \"$r\" in $dv?"; then
428 verbose git push "$rem" HEAD
431 if [ x"$submit" = x"-s" ]; then
434 verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
442 if [ -n "$WE_HATE_OUR_USERS" ]; then
443 TARGETS="sv-debug cl-debug"
444 if [ -z "$CC" ]; then
447 elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
448 # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
449 TARGETS="sv-debug sdl-debug"
451 TARGETS="sv-debug cl-debug sdl-debug"
476 if [ -z "$MAKEFLAGS" ]; then
477 if [ -f /proc/cpuinfo ]; then
478 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
479 if [ $ncpus -gt 1 ]; then
485 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
488 if [ -n "$WE_HATE_OUR_USERS" ]; then
489 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
492 enter "$d0/fteqcc" verbose
494 verbose make $MAKEFLAGS clean
496 verbose make $MAKEFLAGS
497 enter "$d0/data/xonotic-data.pk3dir" verbose
499 verbose make $MAKEFLAGS clean
501 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
502 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
503 enter "$d0/darkplaces" verbose
505 verbose make $MAKEFLAGS clean
507 for T in $TARGETS; do
508 verbose make $MAKEFLAGS "$@" "$T"
512 if [ -n "$WE_HATE_OUR_USERS" ]; then
514 export PATH="$d0/misc/buildfiles/w32:$PATH"
515 elif [ x"`uname`" = x"Darwin" ]; then
516 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
522 sdl|glx|agl|dedicated)
531 if ! [ -x "darkplaces/darkplaces$client" ]; then
532 if [ -x "darkplaces/darkplaces$client.exe" ]; then
535 echo "Client darkplaces/darkplaces$client not found, aborting"
539 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
541 # if pulseaudio is running: USE IT
542 if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
543 if ps -C pulseaudio >/dev/null; then
544 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
545 export SDL_AUDIODRIVER=pulse
550 if [ -n "$USE_GDB" ]; then
551 set -- gdb --args "$@"
557 if verbose cd "$d0/$d"; then
565 patchdir=`mktemp -d -t save-patches.XXXXXX`
567 enter "$d0/$d" verbose
568 git branch -v -v | cut -c 3- | {
570 while read -r BRANCH REV UPSTREAM TEXT; do
573 UPSTREAM=${UPSTREAM#\[}
574 UPSTREAM=${UPSTREAM%\]}
575 UPSTREAM=${UPSTREAM%:*}
579 UPSTREAM=origin/"`repobranch "$d"`"
583 if [ x"$REV" = x"->" ]; then
586 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
587 echo "$d" > "$patchdir/$i/info.txt"
588 echo "$BRANCH" >> "$patchdir/$i/info.txt"
589 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
590 echo "$TRACK" >> "$patchdir/$i/info.txt"
593 rm -rf "$patchdir/$i"
598 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
603 patchdir=`mktemp -d -t restore-patches.XXXXXX`
604 ( cd "$patchdir" && tar xvzf - ) < "$infile"
606 for P in "$patchdir"/*/info.txt; do
613 verbose git checkout HEAD^0
614 verbose git branch -D "$BRANCH"
615 if [ x"$TRACK" = x"true" ]; then
616 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
618 verbose git branch -b "$BRANCH" "$UPSTREAM"
625 if [ "$#" = 1 ]; then
626 set -- "${1%%/*}" "${1#*/}"
629 enter "$d0/$d" verbose
630 git rev-parse "$1/$2" || continue
633 git log HEAD.."$1/$2"
634 git diff HEAD..."$1/$2"
636 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
638 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
642 git reset --hard HEAD@{1}
652 report=$report"$*$LF"
657 report=$report" $*$LF"
662 o=`"$@" | sed 's/^/ /' || true`
666 enter "$d0/$d" verbose
667 base="`repobranch "$d"`"
669 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
670 case "${ref#refs/remotes/origin/}" in
678 reportecho " Branch $ref:"
679 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
680 if [ -n "$note" ]; then
681 reportdo4 echo "$note"
682 reportecho4 "--> not merging, already had this one rejected before"
683 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
685 org=`git rev-parse HEAD`
686 if ! git merge "$ref" 2>&1 | tee "$t"; then
687 git reset --hard "$org"
688 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
690 reportecho4 "--> merge failed"
691 elif ! "$SELF" compile 2>&1 | tee "$t"; then
692 git reset --hard "$org"
693 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
695 reportecho4 "--> compile failed"
696 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
697 git reset --hard "$org"
698 git notes --ref "refs/notes/admin-merge" add "$ref"
699 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
700 reportdo4 echo "$note"
701 reportecho4 "--> test failed"
703 case ",`repoflags "$d"`," in
705 # we do quite a mess here... luckily we know $org
706 git pull # svn needs to be current
707 git rebase -i --onto master "$org"
708 git svn dcommit --add-author-from
709 git reset --hard "$org"
715 reportecho4 "--> MERGED"
716 if yesno "Delete original branch \"$ref\"?"; then
717 git push origin :"${ref#refs/remotes/origin/}"
718 reportecho4 "--> branch deleted"
722 git notes --ref "refs/notes/admin-merge" add "$ref"
723 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
724 if [ -n "$note" ]; then
725 reportdo4 echo "$note"
726 reportecho4 "--> rejected"
728 reportecho4 "--> postponed"
736 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
742 echo " $SELF push [-s]"
743 echo " $SELF branches"
744 echo " $SELF branch [<remote>] <branchname>"
745 echo " $SELF branch <remote> <branchname> <srcbranchname>"
746 echo " $SELF checkout [<remote>] <branchname>"
747 echo " $SELF compile [-c] [<client>] <options>"
748 echo " $SELF run [<client>] <options>"
749 echo " $SELF each <command>"