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/*"
216 # TODO remove this line later
218 verbose git config core.autocrlf false
219 verbose git config core.safecrlf false # we don't NEED that...
221 r=`git symbolic-ref HEAD`
223 if git config branch.$r.remote >/dev/null 2>&1; then
224 if ! verbose git pull; then
225 check_mergeconflict "$d"
226 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
232 checkself "$cmd" "$@"
234 verbose git remote prune origin
238 verbose git clone "$url" "$d0/$d"
239 enter "$d0/$d" verbose
240 verbose git checkout "$branch"
248 if [ -z "$branch" ]; then
254 enter "$d0/$d" verbose
255 if [ -z "$branch" ]; then
260 if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
262 verbose git checkout "$b"
263 elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
265 verbose git checkout --track -b "$b" "$remote/$b"
267 verbose git checkout "`repobranch "$d"`"
270 checkself "$cmd" "$@"
274 echo "The requested branch was not found in any repository."
282 if [ -z "$branch" ]; then
286 if [ -z "$branch" ]; then
289 r=`git symbolic-ref HEAD`
296 dv=`visible_repo_name "$d"`
297 enter "$d0/$d" verbose
298 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
299 echo "Already having this branch in $dv."
301 if yesno "Branch in $dv?"; then
302 if [ -n "$srcbranch" ]; then
305 b="`repobranch "$d"`"
307 # TODO do this without pushing
308 verbose git push "$remote" "$b":"$branch"
309 verbose git checkout --track -b "$branch" "$remote/$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 if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
416 if yesno "Push \"$r\" in $dv?"; then
417 verbose git push "$rem" HEAD
420 if [ x"$submit" = x"-s" ]; then
423 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
431 if [ -n "$WE_HATE_OUR_USERS" ]; then
432 TARGETS="sv-debug cl-debug"
434 TARGETS="sv-debug cl-debug sdl-debug"
459 if [ -z "$MAKEFLAGS" ]; then
460 if [ -f /proc/cpuinfo ]; then
461 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
462 if [ $ncpus -gt 1 ]; then
468 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
471 if [ -n "$WE_HATE_OUR_USERS" ]; then
472 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
475 enter "$d0/fteqcc" verbose
477 verbose make $MAKEFLAGS clean
479 verbose make $MAKEFLAGS
480 enter "$d0/data/xonotic-data.pk3dir" verbose
482 verbose make $MAKEFLAGS clean
484 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
485 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
486 enter "$d0/darkplaces" verbose
488 verbose make $MAKEFLAGS clean
490 for T in $TARGETS; do
491 verbose make $MAKEFLAGS "$@" "$T"
495 if [ -n "$WE_HATE_OUR_USERS" ]; then
497 export PATH="$d0/misc/buildfiles/w32:$PATH"
498 elif [ x"`uname`" = x"Darwin" ]; then
499 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
505 sdl|glx|agl|dedicated)
514 if ! [ -x "darkplaces/darkplaces$client" ]; then
515 if [ -x "darkplaces/darkplaces$client.exe" ]; then
518 echo "Client darkplaces/darkplaces$client not found, aborting"
522 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
524 # if pulseaudio is running: USE IT
525 if ps -C pulseaudio >/dev/null; then
526 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
527 export SDL_AUDIODRIVER=pulse
531 if [ -n "$USE_GDB" ]; then
532 set -- gdb --args "$@"
538 if verbose cd "$d0/$d"; then
546 patchdir=`mktemp -d -t save-patches.XXXXXX`
548 enter "$d0/$d" verbose
549 git branch -v -v | cut -c 3- | {
551 while read -r BRANCH REV UPSTREAM TEXT; do
554 UPSTREAM=${UPSTREAM#\[}
555 UPSTREAM=${UPSTREAM%\]}
556 UPSTREAM=${UPSTREAM%:*}
560 UPSTREAM=origin/"`repobranch "$d"`"
564 if [ x"$REV" = x"->" ]; then
567 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
568 echo "$d" > "$patchdir/$i/info.txt"
569 echo "$BRANCH" >> "$patchdir/$i/info.txt"
570 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
571 echo "$TRACK" >> "$patchdir/$i/info.txt"
574 rm -rf "$patchdir/$i"
579 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
584 patchdir=`mktemp -d -t restore-patches.XXXXXX`
585 ( cd "$patchdir" && tar xvzf - ) < "$infile"
587 for P in "$patchdir"/*/info.txt; do
594 verbose git checkout HEAD^0
595 verbose git branch -D "$BRANCH"
596 if [ x"$TRACK" = x"true" ]; then
597 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
599 verbose git branch -b "$BRANCH" "$UPSTREAM"
606 if [ "$#" = 1 ]; then
607 set -- "${1%%/*}" "${1#*/}"
610 enter "$d0/$d" verbose
611 git rev-parse "$1/$2" || continue
614 git log HEAD.."$1/$2"
615 git diff HEAD..."$1/$2"
617 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
619 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
623 git reset --hard HEAD@{1}
633 report=$report"$*$LF"
638 report=$report" $*$LF"
643 o=`"$@" | sed 's/^/ /' || true`
647 enter "$d0/$d" verbose
649 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
650 case "${ref#refs/remotes/origin/}" in
658 reportecho " Branch $ref:"
659 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
660 if [ -n "$note" ]; then
661 reportdo4 echo "$note"
662 reportecho4 "--> not merging, already had this one rejected before"
663 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
665 org=`git rev-parse HEAD`
666 if ! git merge "$ref" 2>&1 | tee "$t"; then
667 git reset --hard "$org"
668 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
670 reportecho4 "--> merge failed"
671 elif ! "$SELF" compile 2>&1 | tee "$t"; then
672 git reset --hard "$org"
673 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
675 reportecho4 "--> compile failed"
676 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
677 git reset --hard "$org"
678 git notes --ref "refs/notes/admin-merge" add "$ref"
679 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
680 reportdo4 echo "$note"
681 reportecho4 "--> test failed"
683 case ",`repoflags "$d"`," in
687 git svn dcommit --add-author-from
693 reportecho4 "--> MERGED"
694 if yesno "Delete original branch \"$ref\"?"; then
695 git push origin :"${ref#refs/remotes/origin/}"
696 reportecho4 "--> branch deleted"
700 git notes --ref "refs/notes/admin-merge" add "$ref"
701 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
702 if [ -n "$note" ]; then
703 reportdo4 echo "$note"
704 reportecho4 "--> rejected"
706 reportecho4 "--> postponed"
714 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
720 echo " $SELF push [-s]"
721 echo " $SELF branches"
722 echo " $SELF branch [<remote>] <branchname>"
723 echo " $SELF branch <remote> <branchname> <srcbranchname>"
724 echo " $SELF checkout [<remote>] <branchname>"
725 echo " $SELF compile [-c] [<client>] <options>"
726 echo " $SELF run [<client>] <options>"
727 echo " $SELF each <command>"