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
113 data/xonotic-maps.pk3dir
114 data/xonotic-music.pk3dir
115 data/xonotic-nexcompat.pk3dir
117 fteqcc@git://github.com/Blub/qclib.git
118 div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
123 for X in $repos_urls; do
126 if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
132 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
134 if [ "$#" = 0 ]; then
142 base=`git config remote.origin.url`
143 base=${base%xonotic.git}
144 for dcomplete in $repos_urls; do
153 url=$base${d##*/}.git
157 if [ -d "$d0/$d" ]; then
158 enter "$d0/$d" verbose
164 verbose git config remote.origin.url "$url"
168 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
169 # TODO remove this line later
171 verbose git config core.autocrlf false
172 verbose git config core.safecrlf false # we don't NEED that...
174 r=`git symbolic-ref HEAD`
176 if git config branch.$r.remote >/dev/null 2>&1; then
177 if ! verbose git pull; then
178 check_mergeconflict "$d"
179 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
185 checkself "$cmd" "$@"
187 verbose git remote prune origin
190 verbose git clone "$url" "$d0/$d"
197 if [ -z "$branch" ]; then
203 enter "$d0/$d" verbose
204 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
206 verbose git checkout "$branch"
207 elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
209 verbose git checkout --track -b "$branch" "$remote/$branch"
211 verbose git checkout master
214 checkself "$cmd" "$@"
218 echo "The requested branch was not found in any repository."
226 if [ -z "$branch" ]; then
230 if [ -z "$srcbranch" ]; then
233 if [ -z "$branch" ]; then
236 r=`git symbolic-ref HEAD`
243 dv=`visible_repo_name "$d"`
244 enter "$d0/$d" verbose
246 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
247 echo "Branch in $dv?"
250 if [ x"$a" = x"y" ]; then
251 verbose git push "$remote" "$srcbranch":"$branch"
252 verbose git checkout --track -b "$branch" "$remote/$branch"
263 git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
266 UPSTREAM=${UPSTREAM#\[}
267 UPSTREAM=${UPSTREAM%\]}
268 UPSTREAM=${UPSTREAM%:*}
271 TEXT="$UPSTREAM $TEXT"
275 if [ x"$REV" = x"->" ]; then
278 BRANCH=${BRANCH#remotes/}
280 if [ -n "$UPSTREAM" ]; then
281 echo -n " (tracking $UPSTREAM)"
290 dv=`visible_repo_name "$d"`
291 enter "$d0/$d" verbose
292 r=`git symbolic-ref HEAD`
294 if git log HEAD..origin/master | grep .; then
295 # we have uncommitted changes
297 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
298 echo "Could merge from \"master\" into \"$r\" in $dv. Do it?"
301 if [ x"$a" = x"y" ]; then
302 if ! verbose git merge origin/master; then
303 check_mergeconflict "$d"
304 exit 1 # this should ALWAYS be fatal
314 dv=`visible_repo_name "$d"`
315 enter "$d0/$d" verbose
316 r=`git symbolic-ref HEAD`
318 if git diff HEAD | grep .; then
319 # we have uncommitted changes
321 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
322 echo "Uncommitted changes in \"$r\" in $dv. Commit?"
325 if [ x"$a" = x"y" ]; then
326 verbose git commit -a
329 rem=`git config "branch.$r.remote" || echo origin`
330 if git log "$rem/$r".."$r" | grep .; then
332 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
333 echo "Push \"$r\" in $dv?"
336 if [ x"$a" = x"y" ]; then
337 verbose git push "$rem" HEAD
340 if [ x"$submit" = x"-s" ]; then
343 verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
351 if [ -z "$MAKEFLAGS" ]; then
352 if [ -f /proc/cpuinfo ]; then
353 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
354 if [ $ncpus -gt 1 ]; then
359 enter "$d0/fteqcc" verbose
360 verbose make $MAKEFLAGS
361 enter "$d0/data/xonotic-data.pk3dir" verbose
362 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
363 enter "$d0/darkplaces" verbose
364 verbose make $MAKEFLAGS sv-debug
365 verbose make $MAKEFLAGS cl-debug
366 if ! [ -n "$WE_HATE_OUR_USERS" ]; then
367 verbose make $MAKEFLAGS sdl-debug
371 if [ -n "$WE_HATE_OUR_USERS" ]; then
377 sdl|glx|agl|dedicated)
386 if ! [ -x "darkplaces/darkplaces$client" ]; then
387 if [ -x "darkplaces/darkplaces$client.exe" ]; then
390 echo "Client darkplaces/darkplaces$client not found, aborting"
394 #verbose "darkplaces/darkplaces$client" -xonotic "$@"
395 verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
399 enter "$d0/$d" verbose
406 patchdir=`mktemp -d -t save-patches.XXXXXX`
408 enter "$d0/$d" verbose
409 git branch -v -v | cut -c 3- | {
411 while read -r BRANCH REV UPSTREAM TEXT; do
414 UPSTREAM=${UPSTREAM#\[}
415 UPSTREAM=${UPSTREAM%\]}
416 UPSTREAM=${UPSTREAM%:*}
420 UPSTREAM=origin/master
424 if [ x"$REV" = x"->" ]; then
427 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
428 echo "$d" > "$patchdir/$i/info.txt"
429 echo "$BRANCH" >> "$patchdir/$i/info.txt"
430 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
431 echo "$TRACK" >> "$patchdir/$i/info.txt"
434 rm -rf "$patchdir/$i"
439 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
444 patchdir=`mktemp -d -t restore-patches.XXXXXX`
445 ( cd "$patchdir" && tar xvzf - ) < "$infile"
447 for P in "$patchdir"/*/info.txt; do
454 verbose git checkout HEAD^0
455 verbose git branch -D "$BRANCH"
456 if [ x"$TRACK" = x"true" ]; then
457 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
459 verbose git branch -b "$BRANCH" "$UPSTREAM"
467 enter "$d0/$d" verbose
468 git rev-parse "$1/$2" || continue
471 git log HEAD.."$1/$2"
472 git diff HEAD..."$1/$2"
475 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
476 echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
479 if [ x"$a" = x"y" ]; then
483 if ! "$SELF" compile; then
487 while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
488 echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
491 if [ x"$a" = x"y" ]; then
495 git reset --hard HEAD@{1}
504 echo " $SELF push [-s]"
505 echo " $SELF branches"
506 echo " $SELF branch [<remote>] <branchname>"
507 echo " $SELF branch <remote> <branchname> <srcbranchname>"
508 echo " $SELF checkout [<remote>] <branchname>"
509 echo " $SELF compile"
510 echo " $SELF run <client> <options>"
511 echo " $SELF each <command>"