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 git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
257 verbose git checkout "$branch"
258 elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
260 verbose git checkout --track -b "$branch" "$remote/$branch"
262 verbose git checkout "`repobranch "$d"`"
265 checkself "$cmd" "$@"
269 echo "The requested branch was not found in any repository."
277 if [ -z "$branch" ]; then
281 if [ -z "$branch" ]; then
284 r=`git symbolic-ref HEAD`
291 dv=`visible_repo_name "$d"`
292 enter "$d0/$d" verbose
293 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
294 echo "Already having this branch in $dv."
296 if yesno "Branch in $dv?"; then
297 if [ -n "$srcbranch" ]; then
300 b="`repobranch "$d"`"
302 # TODO do this without pushing
303 verbose git push "$remote" "$b":"$branch"
304 verbose git checkout --track -b "$branch" "$remote/$branch"
316 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
319 UPSTREAM=${UPSTREAM#\[}
320 UPSTREAM=${UPSTREAM%\]}
321 UPSTREAM=${UPSTREAM%:*}
324 TEXT="$UPSTREAM $TEXT"
328 if [ x"$REV" = x"->" ]; then
331 BRANCH=${BRANCH#remotes/}
333 if [ -n "$UPSTREAM" ]; then
334 echo -n " (tracking $UPSTREAM)"
343 cd "$d0/$d" # am in a pipe, shouldn't use enter
344 git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
349 while read -r d BRANCH REV UPSTREAM TEXT; do
352 UPSTREAM=${UPSTREAM#\[}
353 UPSTREAM=${UPSTREAM%\]}
354 UPSTREAM=${UPSTREAM%:*}
357 TEXT="$UPSTREAM $TEXT"
361 if [ x"$REV" = x"->" ]; then
364 BRANCH=${BRANCH#remotes/}
365 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
366 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
367 eval "r=\$branches_repos_$ID"
369 eval "branches_repos_$ID=\$r"
371 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
372 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
373 eval "r=\$branches_repos_$ID"
380 dv=`visible_repo_name "$d"`
381 enter "$d0/$d" verbose
382 r=`git symbolic-ref HEAD`
384 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
385 # we have uncommitted changes
386 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
387 if ! verbose git merge origin/"`repobranch "$d"`"; then
388 check_mergeconflict "$d"
389 exit 1 # this should ALWAYS be fatal
399 dv=`visible_repo_name "$d"`
400 enter "$d0/$d" verbose
401 r=`git symbolic-ref HEAD`
403 if git diff HEAD | grep .; then
404 # we have uncommitted changes
405 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
406 verbose git commit -a
409 rem=`git config "branch.$r.remote" || echo origin`
410 if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
411 if yesno "Push \"$r\" in $dv?"; then
412 verbose git push "$rem" HEAD
415 if [ x"$submit" = x"-s" ]; then
418 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
426 if [ -n "$WE_HATE_OUR_USERS" ]; then
427 TARGETS="sv-debug cl-debug"
429 TARGETS="sv-debug cl-debug sdl-debug"
454 if [ -z "$MAKEFLAGS" ]; then
455 if [ -f /proc/cpuinfo ]; then
456 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
457 if [ $ncpus -gt 1 ]; then
463 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
466 if [ -n "$WE_HATE_OUR_USERS" ]; then
467 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
470 enter "$d0/fteqcc" verbose
472 verbose make $MAKEFLAGS clean
474 verbose make $MAKEFLAGS
475 enter "$d0/data/xonotic-data.pk3dir" verbose
477 verbose make $MAKEFLAGS clean
479 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
480 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
481 enter "$d0/darkplaces" verbose
483 verbose make $MAKEFLAGS clean
485 for T in $TARGETS; do
486 verbose make $MAKEFLAGS "$@" "$T"
490 if [ -n "$WE_HATE_OUR_USERS" ]; then
492 export PATH="$d0/misc/buildfiles/w32:$PATH"
493 elif [ x"`uname`" = x"Darwin" ]; then
494 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
500 sdl|glx|agl|dedicated)
509 if ! [ -x "darkplaces/darkplaces$client" ]; then
510 if [ -x "darkplaces/darkplaces$client.exe" ]; then
513 echo "Client darkplaces/darkplaces$client not found, aborting"
517 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
519 # if pulseaudio is running: USE IT
520 if ps -C pulseaudio >/dev/null; then
521 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
522 export SDL_AUDIODRIVER=pulse
526 if [ -n "$USE_GDB" ]; then
527 set -- gdb --args "$@"
533 if verbose cd "$d0/$d"; then
541 patchdir=`mktemp -d -t save-patches.XXXXXX`
543 enter "$d0/$d" verbose
544 git branch -v -v | cut -c 3- | {
546 while read -r BRANCH REV UPSTREAM TEXT; do
549 UPSTREAM=${UPSTREAM#\[}
550 UPSTREAM=${UPSTREAM%\]}
551 UPSTREAM=${UPSTREAM%:*}
555 UPSTREAM=origin/"`repobranch "$d"`"
559 if [ x"$REV" = x"->" ]; then
562 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
563 echo "$d" > "$patchdir/$i/info.txt"
564 echo "$BRANCH" >> "$patchdir/$i/info.txt"
565 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
566 echo "$TRACK" >> "$patchdir/$i/info.txt"
569 rm -rf "$patchdir/$i"
574 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
579 patchdir=`mktemp -d -t restore-patches.XXXXXX`
580 ( cd "$patchdir" && tar xvzf - ) < "$infile"
582 for P in "$patchdir"/*/info.txt; do
589 verbose git checkout HEAD^0
590 verbose git branch -D "$BRANCH"
591 if [ x"$TRACK" = x"true" ]; then
592 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
594 verbose git branch -b "$BRANCH" "$UPSTREAM"
601 if [ "$#" = 1 ]; then
602 set -- "${1%%/*}" "${1#*/}"
605 enter "$d0/$d" verbose
606 git rev-parse "$1/$2" || continue
609 git log HEAD.."$1/$2"
610 git diff HEAD..."$1/$2"
612 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
614 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
618 git reset --hard HEAD@{1}
628 report=$report"$*$LF"
633 report=$report" $*$LF"
638 o=`"$@" | sed 's/^/ /' || true`
642 enter "$d0/$d" verbose
644 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
645 case "${ref#refs/remotes/origin/}" in
653 reportecho " Branch $ref:"
654 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
655 if [ -n "$note" ]; then
656 reportdo4 echo "$note"
657 reportecho4 "--> not merging, already had this one rejected before"
658 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
660 org=`git rev-parse HEAD`
661 if ! git merge "$ref" 2>&1 | tee "$t"; then
662 git reset --hard "$org"
663 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
665 reportecho4 "--> merge failed"
666 elif ! "$SELF" compile 2>&1 | tee "$t"; then
667 git reset --hard "$org"
668 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
670 reportecho4 "--> compile failed"
671 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
672 git reset --hard "$org"
673 git notes --ref "refs/notes/admin-merge" add "$ref"
674 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
675 reportdo4 echo "$note"
676 reportecho4 "--> test failed"
678 case ",`repoflags "$d"`," in
682 git svn dcommit --add-author-from
688 reportecho4 "--> MERGED"
689 if yesno "Delete original branch \"$ref\"?"; then
690 git push origin :"${ref#refs/remotes/origin/}"
691 reportecho4 "--> branch deleted"
695 git notes --ref "refs/notes/admin-merge" add "$ref"
696 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
697 if [ -n "$note" ]; then
698 reportdo4 echo "$note"
699 reportecho4 "--> rejected"
701 reportecho4 "--> postponed"
709 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
715 echo " $SELF push [-s]"
716 echo " $SELF branches"
717 echo " $SELF branch [<remote>] <branchname>"
718 echo " $SELF branch <remote> <branchname> <srcbranchname>"
719 echo " $SELF checkout [<remote>] <branchname>"
720 echo " $SELF compile [-c] [<client>] <options>"
721 echo " $SELF run [<client>] <options>"
722 echo " $SELF each <command>"