7 while ! [ -f ./all ]; do
8 if [ x"`pwd`" = x"/" ]; then
9 echo "Cannot find myself."
10 echo "Please run this script with the working directory inside a Xonotic checkout."
18 # If we are on WINDOWS:
23 # Windows hates users. So this script has to copy itself elsewhere first...
25 cp "$SELF" ../all.xonotic.sh
26 export WE_HATE_OUR_USERS=1
27 exec ../all.xonotic.sh "$@"
40 if [ -x /usr/bin/md5sum ]; then
42 elif [ -x /bin/md5sum ]; then
44 elif [ -x /usr/bin/cksum ]; then
51 self=`checksum "$SELF"`
54 self_new=`checksum "$SELF"`
55 if [ x"$self" != x"$self_new" ]; then
56 msg "./all has changed."
57 if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
58 msg "Rerunning the requested operation to make sure."
59 export XONOTIC_FORBID_RERUN_ALL=1
62 msg "Please try $SELF update, and then retry your requested operation."
79 echo "the root directory"
89 if git ls-files -u | grep ' 1 '; then
91 echo "MERGE CONFLICT."
92 echo "change into the \"$1\" project directory, and then:"
93 echo "- edit the files mentioned above with your favorite editor,"
94 echo " and fix the conflicts (marked with <<<<<<< blocks)"
95 echo "- for binary files, you can select the files using"
96 echo " git checkout --ours or git checkout --theirs"
97 echo "- when done with a file, 'git add' the file"
98 echo "- when done, 'git commit'"
107 while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
118 check_mergeconflict "$1"
123 data/xonotic-data.pk3dir | | master |
124 data/xonotic-maps.pk3dir | | master |
125 data/xonotic-music.pk3dir | | master |
126 data/xonotic-nexcompat.pk3dir | | master |
127 mediasource | | master |
128 darkplaces | | div0-stable | svn
129 fteqcc | git://github.com/Blub/qclib.git | master |
130 div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master |
131 netradiant | | master |
133 # todo: in darkplaces, change repobranch to div0-stable
135 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
137 base=`git config remote.origin.url`
140 base=${base%xonotic.git}
143 echo "The main repo is not xonotic.git, what have you done?"
150 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
161 if [ x"$1" = x"." ]; then
162 echo "$base""xonotic.git"
164 echo "$base${1##*/}.git"
171 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
181 echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
185 repos=`for d in $repos; do
187 if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
192 if [ "$#" = 0 ]; then
201 if [ x"$1" = x"-N" ]; then
206 branch=`repobranch "$d"`
207 if [ -d "$d0/$d" ]; then
209 enter "$d0/$d" verbose
210 verbose git config remote.origin.url "$url"
211 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
212 # TODO remove this line later
214 verbose git config core.autocrlf false
215 verbose git config core.safecrlf false # we don't NEED that...
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 verbose git checkout "$branch"
244 if [ -z "$branch" ]; then
250 enter "$d0/$d" verbose
251 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
253 verbose git checkout "$branch"
254 elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
256 verbose git checkout --track -b "$branch" "$remote/$branch"
258 verbose git checkout "`repobranch "$d"`"
261 checkself "$cmd" "$@"
265 echo "The requested branch was not found in any repository."
273 if [ -z "$branch" ]; then
277 if [ -z "$branch" ]; then
280 r=`git symbolic-ref HEAD`
287 dv=`visible_repo_name "$d"`
288 enter "$d0/$d" verbose
289 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
290 echo "Already having this branch in $dv."
292 if yesno "Branch in $dv?"; then
293 if [ -n "$srcbranch" ]; then
296 b="`repobranch "$d"`"
298 # TODO do this without pushing
299 verbose git push "$remote" "$b":"$branch"
300 verbose git checkout --track -b "$branch" "$remote/$branch"
312 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
315 UPSTREAM=${UPSTREAM#\[}
316 UPSTREAM=${UPSTREAM%\]}
317 UPSTREAM=${UPSTREAM%:*}
320 TEXT="$UPSTREAM $TEXT"
324 if [ x"$REV" = x"->" ]; then
327 BRANCH=${BRANCH#remotes/}
329 if [ -n "$UPSTREAM" ]; then
330 echo -n " (tracking $UPSTREAM)"
339 cd "$d0/$d" # am in a pipe, shouldn't use enter
340 git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
345 while read -r d BRANCH REV UPSTREAM TEXT; do
348 UPSTREAM=${UPSTREAM#\[}
349 UPSTREAM=${UPSTREAM%\]}
350 UPSTREAM=${UPSTREAM%:*}
353 TEXT="$UPSTREAM $TEXT"
357 if [ x"$REV" = x"->" ]; then
360 BRANCH=${BRANCH#remotes/}
361 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
362 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
363 eval "r=\$branches_repos_$ID"
365 eval "branches_repos_$ID=\$r"
367 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
368 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
369 eval "r=\$branches_repos_$ID"
376 dv=`visible_repo_name "$d"`
377 enter "$d0/$d" verbose
378 r=`git symbolic-ref HEAD`
380 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
381 # we have uncommitted changes
382 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
383 if ! verbose git merge origin/"`repobranch "$d"`"; then
384 check_mergeconflict "$d"
385 exit 1 # this should ALWAYS be fatal
395 dv=`visible_repo_name "$d"`
396 enter "$d0/$d" verbose
397 r=`git symbolic-ref HEAD`
399 if git diff HEAD | grep .; then
400 # we have uncommitted changes
401 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
402 verbose git commit -a
405 rem=`git config "branch.$r.remote" || echo origin`
406 if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
407 if yesno "Push \"$r\" in $dv?"; then
408 verbose git push "$rem" HEAD
411 if [ x"$submit" = x"-s" ]; then
414 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
422 if [ -n "$WE_HATE_OUR_USERS" ]; then
423 TARGETS="sv-debug cl-debug"
425 TARGETS="sv-debug cl-debug sdl-debug"
450 if [ -z "$MAKEFLAGS" ]; then
451 if [ -f /proc/cpuinfo ]; then
452 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
453 if [ $ncpus -gt 1 ]; then
459 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
462 if [ -n "$WE_HATE_OUR_USERS" ]; then
463 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
466 enter "$d0/fteqcc" verbose
468 verbose make $MAKEFLAGS clean
470 verbose make $MAKEFLAGS
471 enter "$d0/data/xonotic-data.pk3dir" verbose
473 verbose make $MAKEFLAGS clean
475 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
476 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
477 enter "$d0/darkplaces" verbose
479 verbose make $MAKEFLAGS clean
481 for T in $TARGETS; do
482 verbose make $MAKEFLAGS "$@" "$T"
486 if [ -n "$WE_HATE_OUR_USERS" ]; then
488 export PATH="$d0/misc/buildfiles/w32:$PATH"
489 elif [ x"`uname`" = x"Darwin" ]; then
490 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
496 sdl|glx|agl|dedicated)
505 if ! [ -x "darkplaces/darkplaces$client" ]; then
506 if [ -x "darkplaces/darkplaces$client.exe" ]; then
509 echo "Client darkplaces/darkplaces$client not found, aborting"
513 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
515 # if pulseaudio is running: USE IT
516 if ps -C pulseaudio >/dev/null; then
517 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
518 export SDL_AUDIODRIVER=pulse
522 if [ -n "$USE_GDB" ]; then
523 set -- gdb --args "$@"
529 if verbose cd "$d0/$d"; then
537 patchdir=`mktemp -d -t save-patches.XXXXXX`
539 enter "$d0/$d" verbose
540 git branch -v -v | cut -c 3- | {
542 while read -r BRANCH REV UPSTREAM TEXT; do
545 UPSTREAM=${UPSTREAM#\[}
546 UPSTREAM=${UPSTREAM%\]}
547 UPSTREAM=${UPSTREAM%:*}
551 UPSTREAM=origin/"`repobranch "$d"`"
555 if [ x"$REV" = x"->" ]; then
558 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
559 echo "$d" > "$patchdir/$i/info.txt"
560 echo "$BRANCH" >> "$patchdir/$i/info.txt"
561 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
562 echo "$TRACK" >> "$patchdir/$i/info.txt"
565 rm -rf "$patchdir/$i"
570 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
575 patchdir=`mktemp -d -t restore-patches.XXXXXX`
576 ( cd "$patchdir" && tar xvzf - ) < "$infile"
578 for P in "$patchdir"/*/info.txt; do
585 verbose git checkout HEAD^0
586 verbose git branch -D "$BRANCH"
587 if [ x"$TRACK" = x"true" ]; then
588 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
590 verbose git branch -b "$BRANCH" "$UPSTREAM"
597 if [ "$#" = 1 ]; then
598 set -- "${1%%/*}" "${1#*/}"
601 enter "$d0/$d" verbose
602 git rev-parse "$1/$2" || continue
605 git log HEAD.."$1/$2"
606 git diff HEAD..."$1/$2"
608 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
610 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
614 git reset --hard HEAD@{1}
622 enter "$d0/$d" verbose
623 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
624 case "${ref#refs/remotes/origin/}" in
633 if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
634 echo "Not merging, already had this one"
635 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
637 org=`git rev-parse HEAD`
638 if ! git merge "$ref" 2>&1 | tee "$t"; then
639 git reset --hard "$org"
640 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:
642 elif ! "$SELF" compile 2>&1 | tee "$t"; then
643 git reset --hard "$org"
644 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:
646 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
647 git reset --hard "$org"
648 git notes --ref "refs/notes/admin-merge" add "$ref"
650 case ",`repoflags "$d"`," in
654 git svn dcommit --add-author-from
660 if yesno "Delete original branch \"$ref\"?"; then
661 git push origin :"${ref#refs/remotes/origin/}"
665 git notes --ref "refs/notes/admin-merge" add "$ref"
675 echo " $SELF push [-s]"
676 echo " $SELF branches"
677 echo " $SELF branch [<remote>] <branchname>"
678 echo " $SELF branch <remote> <branchname> <srcbranchname>"
679 echo " $SELF checkout [<remote>] <branchname>"
680 echo " $SELF compile [-c] [<client>] <options>"
681 echo " $SELF run [<client>] <options>"
682 echo " $SELF each <command>"