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
117 check_mergeconflict "$1"
122 data/xonotic-data.pk3dir | | master
123 data/xonotic-maps.pk3dir | | master
124 data/xonotic-music.pk3dir | | master
125 data/xonotic-nexcompat.pk3dir | | master
126 mediasource | | master
127 darkplaces | | div0-stable
128 fteqcc | git://github.com/Blub/qclib.git | master
129 div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master
130 netradiant | | master
132 # todo: in darkplaces, change repobranch to div0-stable
134 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
136 base=`git config remote.origin.url`
139 base=${base%xonotic.git}
142 echo "The main repo is not xonotic.git, what have you done?"
149 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
160 if [ x"$1" = x"." ]; then
161 echo "$base""xonotic.git"
163 echo "$base${1##*/}.git"
170 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
178 repos=`for d in $repos; do
180 if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
185 if [ "$#" = 0 ]; then
194 if [ x"$1" = x"-N" ]; then
199 branch=`repobranch "$d"`
200 if [ -d "$d0/$d" ]; then
202 enter "$d0/$d" verbose
203 verbose git config remote.origin.url "$url"
204 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
205 # TODO remove this line later
207 verbose git config core.autocrlf false
208 verbose git config core.safecrlf false # we don't NEED that...
210 r=`git symbolic-ref HEAD`
212 if git config branch.$r.remote >/dev/null 2>&1; then
213 if ! verbose git pull; then
214 check_mergeconflict "$d"
215 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
221 checkself "$cmd" "$@"
223 verbose git remote prune origin
227 verbose git clone "$url" "$d0/$d"
228 enter "$d0/$d" verbose
229 verbose git checkout "$branch"
237 if [ -z "$branch" ]; then
243 enter "$d0/$d" verbose
244 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
246 verbose git checkout "$branch"
247 elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
249 verbose git checkout --track -b "$branch" "$remote/$branch"
251 verbose git checkout "`repobranch "$d"`"
254 checkself "$cmd" "$@"
258 echo "The requested branch was not found in any repository."
266 if [ -z "$branch" ]; then
270 if [ -z "$branch" ]; then
273 r=`git symbolic-ref HEAD`
280 dv=`visible_repo_name "$d"`
281 enter "$d0/$d" verbose
282 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
283 echo "Already having this branch in $dv."
285 if yesno "Branch in $dv?"; then
286 if [ -n "$srcbranch" ]; then
289 b="`repobranch "$d"`"
291 # TODO do this without pushing
292 verbose git push "$remote" "$b":"$branch"
293 verbose git checkout --track -b "$branch" "$remote/$branch"
305 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
308 UPSTREAM=${UPSTREAM#\[}
309 UPSTREAM=${UPSTREAM%\]}
310 UPSTREAM=${UPSTREAM%:*}
313 TEXT="$UPSTREAM $TEXT"
317 if [ x"$REV" = x"->" ]; then
320 BRANCH=${BRANCH#remotes/}
322 if [ -n "$UPSTREAM" ]; then
323 echo -n " (tracking $UPSTREAM)"
332 cd "$d0/$d" # am in a pipe, shouldn't use enter
333 git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
338 while read -r d BRANCH REV UPSTREAM TEXT; do
341 UPSTREAM=${UPSTREAM#\[}
342 UPSTREAM=${UPSTREAM%\]}
343 UPSTREAM=${UPSTREAM%:*}
346 TEXT="$UPSTREAM $TEXT"
350 if [ x"$REV" = x"->" ]; then
353 BRANCH=${BRANCH#remotes/}
354 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
355 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
356 eval "r=\$branches_repos_$ID"
358 eval "branches_repos_$ID=\$r"
360 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
361 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
362 eval "r=\$branches_repos_$ID"
369 dv=`visible_repo_name "$d"`
370 enter "$d0/$d" verbose
371 r=`git symbolic-ref HEAD`
373 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
374 # we have uncommitted changes
375 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
376 if ! verbose git merge origin/"`repobranch "$d"`"; then
377 check_mergeconflict "$d"
378 exit 1 # this should ALWAYS be fatal
388 dv=`visible_repo_name "$d"`
389 enter "$d0/$d" verbose
390 r=`git symbolic-ref HEAD`
392 if git diff HEAD | grep .; then
393 # we have uncommitted changes
394 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
395 verbose git commit -a
398 rem=`git config "branch.$r.remote" || echo origin`
399 if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
400 if yesno "Push \"$r\" in $dv?"; then
401 verbose git push "$rem" HEAD
404 if [ x"$submit" = x"-s" ]; then
407 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
415 if [ -n "$WE_HATE_OUR_USERS" ]; then
416 TARGETS="sv-debug cl-debug"
418 TARGETS="sv-debug cl-debug sdl-debug"
443 if [ -z "$MAKEFLAGS" ]; then
444 if [ -f /proc/cpuinfo ]; then
445 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
446 if [ $ncpus -gt 1 ]; then
452 MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
455 if [ -n "$WE_HATE_OUR_USERS" ]; then
456 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
459 enter "$d0/fteqcc" verbose
461 verbose make $MAKEFLAGS clean
463 verbose make $MAKEFLAGS
464 enter "$d0/data/xonotic-data.pk3dir" verbose
466 verbose make $MAKEFLAGS clean
468 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
469 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
470 enter "$d0/darkplaces" verbose
472 verbose make $MAKEFLAGS clean
474 for T in $TARGETS; do
475 verbose make $MAKEFLAGS "$@" "$T"
479 if [ -n "$WE_HATE_OUR_USERS" ]; then
481 export PATH="$d0/misc/buildfiles/w32:$PATH"
482 elif [ x"`uname`" = x"Darwin" ]; then
483 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
489 sdl|glx|agl|dedicated)
498 if ! [ -x "darkplaces/darkplaces$client" ]; then
499 if [ -x "darkplaces/darkplaces$client.exe" ]; then
502 echo "Client darkplaces/darkplaces$client not found, aborting"
506 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
508 # if pulseaudio is running: USE IT
509 if ps -C pulseaudio >/dev/null; then
510 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
511 export SDL_AUDIODRIVER=pulse
515 if [ -n "$USE_GDB" ]; then
516 set -- gdb --args "$@"
522 if verbose cd "$d0/$d"; then
530 patchdir=`mktemp -d -t save-patches.XXXXXX`
532 enter "$d0/$d" verbose
533 git branch -v -v | cut -c 3- | {
535 while read -r BRANCH REV UPSTREAM TEXT; do
538 UPSTREAM=${UPSTREAM#\[}
539 UPSTREAM=${UPSTREAM%\]}
540 UPSTREAM=${UPSTREAM%:*}
544 UPSTREAM=origin/"`repobranch "$d"`"
548 if [ x"$REV" = x"->" ]; then
551 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
552 echo "$d" > "$patchdir/$i/info.txt"
553 echo "$BRANCH" >> "$patchdir/$i/info.txt"
554 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
555 echo "$TRACK" >> "$patchdir/$i/info.txt"
558 rm -rf "$patchdir/$i"
563 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
568 patchdir=`mktemp -d -t restore-patches.XXXXXX`
569 ( cd "$patchdir" && tar xvzf - ) < "$infile"
571 for P in "$patchdir"/*/info.txt; do
578 verbose git checkout HEAD^0
579 verbose git branch -D "$BRANCH"
580 if [ x"$TRACK" = x"true" ]; then
581 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
583 verbose git branch -b "$BRANCH" "$UPSTREAM"
590 if [ "$#" = 1 ]; then
591 set -- "${1%%/*}" "${1#*/}"
594 enter "$d0/$d" verbose
595 git rev-parse "$1/$2" || continue
598 git log HEAD.."$1/$2"
599 git diff HEAD..."$1/$2"
601 if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
603 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
607 git reset --hard HEAD@{1}
615 enter "$d0/$d" verbose
616 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
617 case "${ref#refs/remotes/origin/}" in
626 if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
627 echo "Not merging, already had this one"
628 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD.."$ref"; } | less'; then
629 org=`git rev-parse HEAD`
630 if ! git merge "$ref" 2>&1 | tee "$t"; then
631 git reset --hard "$org"
632 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:
634 elif ! "$SELF" compile 2>&1 | tee "$t"; then
635 git reset --hard "$org"
636 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:
638 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
639 git reset --hard HEAD@{1}
640 git notes --ref "refs/notes/admin-merge" add "$ref"
643 git push origin :"${ref#refs/remotes/origin/}"
646 git reset --hard HEAD@{1}
647 git notes --ref "refs/notes/admin-merge" add "$ref"
657 echo " $SELF push [-s]"
658 echo " $SELF branches"
659 echo " $SELF branch [<remote>] <branchname>"
660 echo " $SELF branch <remote> <branchname> <srcbranchname>"
661 echo " $SELF checkout [<remote>] <branchname>"
662 echo " $SELF compile [-c] [<client>] <options>"
663 echo " $SELF run [<client>] <options>"
664 echo " $SELF each <command>"