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 check_mergeconflict "$1"
112 data/xonotic-data.pk3dir | | master
113 data/xonotic-maps.pk3dir | | master
114 data/xonotic-music.pk3dir | | master
115 data/xonotic-nexcompat.pk3dir | | master
116 darkplaces | | div0-stable
117 fteqcc | git://github.com/Blub/qclib.git | master
118 div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master
119 netradiant | | master
121 # todo: in darkplaces, change repobranch to div0-stable
123 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
125 base=`git config remote.origin.url`
126 base=${base%xonotic.git}
130 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
134 if [ x"$1" = x"." ]; then
135 echo "$base""xonotic.git"
137 echo "$base${1##*/}.git"
144 t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
152 repos=`for d in $repos; do
154 if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
159 if [ "$#" = 0 ]; then
169 branch=`repobranch "$d"`
170 if [ -d "$d0/$d" ]; then
171 enter "$d0/$d" verbose
172 verbose git config remote.origin.url "$url"
173 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
174 # TODO remove this line later
176 verbose git config core.autocrlf false
177 verbose git config core.safecrlf false # we don't NEED that...
179 r=`git symbolic-ref HEAD`
181 if git config branch.$r.remote >/dev/null 2>&1; then
182 if ! verbose git pull; then
183 check_mergeconflict "$d"
184 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
190 checkself "$cmd" "$@"
192 verbose git remote prune origin
195 verbose git clone "$url" "$d0/$d"
196 enter "$d0/$d" verbose
197 verbose git checkout "$branch"
205 if [ -z "$branch" ]; then
211 enter "$d0/$d" verbose
212 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
214 verbose git checkout "$branch"
215 elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
217 verbose git checkout --track -b "$branch" "$remote/$branch"
219 verbose git checkout "`repobranch "$d"`"
222 checkself "$cmd" "$@"
226 echo "The requested branch was not found in any repository."
234 if [ -z "$branch" ]; then
238 if [ -z "$branch" ]; then
241 r=`git symbolic-ref HEAD`
248 dv=`visible_repo_name "$d"`
249 enter "$d0/$d" verbose
251 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
252 echo "Already having this branch in $dv."
254 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
255 echo "Branch in $dv?"
258 if [ x"$a" = x"y" ]; then
259 if [ -n "$srcbranch" ]; then
262 b="`repobranch "$d"`"
264 verbose git push "$remote" "$b":"$branch"
265 verbose git checkout --track -b "$branch" "$remote/$branch"
277 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
280 UPSTREAM=${UPSTREAM#\[}
281 UPSTREAM=${UPSTREAM%\]}
282 UPSTREAM=${UPSTREAM%:*}
285 TEXT="$UPSTREAM $TEXT"
289 if [ x"$REV" = x"->" ]; then
292 BRANCH=${BRANCH#remotes/}
294 if [ -n "$UPSTREAM" ]; then
295 echo -n " (tracking $UPSTREAM)"
304 dv=`visible_repo_name "$d"`
305 enter "$d0/$d" verbose
306 r=`git symbolic-ref HEAD`
308 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
309 # we have uncommitted changes
311 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
312 echo "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"
315 if [ x"$a" = x"y" ]; then
316 if ! verbose git merge origin/"`repobranch "$d"`"; then
317 check_mergeconflict "$d"
318 exit 1 # this should ALWAYS be fatal
328 dv=`visible_repo_name "$d"`
329 enter "$d0/$d" verbose
330 r=`git symbolic-ref HEAD`
332 if git diff HEAD | grep .; then
333 # we have uncommitted changes
335 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
336 echo "Uncommitted changes in \"$r\" in $dv. Commit?"
339 if [ x"$a" = x"y" ]; then
340 verbose git commit -a
343 rem=`git config "branch.$r.remote" || echo origin`
344 if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
346 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
347 echo "Push \"$r\" in $dv?"
350 if [ x"$a" = x"y" ]; then
351 verbose git push "$rem" HEAD
354 if [ x"$submit" = x"-s" ]; then
357 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
365 if [ -n "$WE_HATE_OUR_USERS" ]; then
366 TARGETS="sv-debug cl-debug"
368 TARGETS="sv-debug cl-debug sdl-debug"
384 if [ -z "$MAKEFLAGS" ]; then
385 if [ -f /proc/cpuinfo ]; then
386 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
387 if [ $ncpus -gt 1 ]; then
392 enter "$d0/fteqcc" verbose
393 verbose make $MAKEFLAGS
394 enter "$d0/data/xonotic-data.pk3dir" verbose
395 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
396 enter "$d0/darkplaces" verbose
397 for T in $TARGETS; do
398 verbose make $MAKEFLAGS "$T"
402 if [ -n "$WE_HATE_OUR_USERS" ]; then
404 export PATH="$d0/misc/buildfiles/w32:$PATH"
409 sdl|glx|agl|dedicated)
418 if ! [ -x "darkplaces/darkplaces$client" ]; then
419 if [ -x "darkplaces/darkplaces$client.exe" ]; then
422 echo "Client darkplaces/darkplaces$client not found, aborting"
426 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
427 if [ -n "$USE_GDB" ]; then
428 set -- gdb --args "$@"
434 enter "$d0/$d" verbose
441 patchdir=`mktemp -d -t save-patches.XXXXXX`
443 enter "$d0/$d" verbose
444 git branch -v -v | cut -c 3- | {
446 while read -r BRANCH REV UPSTREAM TEXT; do
449 UPSTREAM=${UPSTREAM#\[}
450 UPSTREAM=${UPSTREAM%\]}
451 UPSTREAM=${UPSTREAM%:*}
455 UPSTREAM=origin/"`repobranch "$d"`"
459 if [ x"$REV" = x"->" ]; then
462 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
463 echo "$d" > "$patchdir/$i/info.txt"
464 echo "$BRANCH" >> "$patchdir/$i/info.txt"
465 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
466 echo "$TRACK" >> "$patchdir/$i/info.txt"
469 rm -rf "$patchdir/$i"
474 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
479 patchdir=`mktemp -d -t restore-patches.XXXXXX`
480 ( cd "$patchdir" && tar xvzf - ) < "$infile"
482 for P in "$patchdir"/*/info.txt; do
489 verbose git checkout HEAD^0
490 verbose git branch -D "$BRANCH"
491 if [ x"$TRACK" = x"true" ]; then
492 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
494 verbose git branch -b "$BRANCH" "$UPSTREAM"
502 enter "$d0/$d" verbose
503 git rev-parse "$1/$2" || continue
506 git log HEAD.."$1/$2"
507 git diff HEAD..."$1/$2"
510 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
511 echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
514 if [ x"$a" = x"y" ]; then
518 if ! "$SELF" compile; then
522 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
523 echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
526 if [ x"$a" = x"y" ]; then
530 git reset --hard HEAD@{1}
539 echo " $SELF push [-s]"
540 echo " $SELF branches"
541 echo " $SELF branch [<remote>] <branchname>"
542 echo " $SELF branch <remote> <branchname> <srcbranchname>"
543 echo " $SELF checkout [<remote>] <branchname>"
544 echo " $SELF compile"
545 echo " $SELF run <client> <options>"
546 echo " $SELF each <command>"