also touch all files, to make git actually reread them
[xonotic/xonotic.git] / all
1 #!/bin/sh
2 # vim: filetype=zsh
3
4 set -e
5
6 # I use this in EVERY shell script ;)
7 LF="
8 "
9
10 d00=`pwd`
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."
15                 exit 1
16         fi
17         cd ..
18 done
19 d0=`pwd`
20 SELF="$d0/all"
21
22 # If we are on WINDOWS:
23 case "$0" in
24         all|*/all)
25                 case "`uname`" in
26                         MINGW*|Win*)
27                                 # Windows hates users. So this script has to copy itself elsewhere first...
28                                 cp "$SELF" ../all.xonotic.sh
29                                 export WE_HATE_OUR_USERS=1
30                                 exec ../all.xonotic.sh "$@"
31                                 ;;
32                 esac
33                 ;;
34 esac
35
36 msg()
37 {
38         echo "\e[1m$*\e[m"
39 }
40
41 self=`git hash-object "$SELF"`
42 checkself()
43 {
44         self_new=`git hash-object "$SELF"`
45         if [ x"$self" != x"$self_new" ]; then
46                 msg "./all has changed."
47                 if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
48                         msg "Rerunning the requested operation to make sure."
49                         export XONOTIC_FORBID_RERUN_ALL=1
50                         exec "$SELF" "$@"
51                 else
52                         msg "Please try $SELF update, and then retry your requested operation."
53                         exit 1
54                 fi
55         fi
56         return 0
57 }
58
59 verbose()
60 {
61         msg "+ $*"
62         "$@"
63 }
64
65 visible_repo_name()
66 {
67         case "$1" in
68                 .)
69                         echo "the root directory"
70                         ;;
71                 *)
72                         echo "\"$1\""
73                         ;;
74         esac
75 }
76
77 check_mergeconflict()
78 {
79         if git ls-files -u | grep ' 1   '; then
80                 echo
81                 echo "MERGE CONFLICT."
82                 echo "change into the \"$1\" project directory, and then:"
83                 echo "- edit the files mentioned above with your favorite editor,"
84                 echo "  and fix the conflicts (marked with <<<<<<< blocks)"
85                 echo "- for binary files, you can select the files using"
86                 echo "  git checkout --ours or git checkout --theirs"
87                 echo "- when done with a file, 'git add' the file"
88                 echo "- when done, 'git commit'"
89                 echo
90                 exit 1
91         fi
92 }
93
94 yesno()
95 {
96         yesno=
97         while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
98                 eval "$2"
99                 echo "$1"
100                 IFS= read -r yesno
101         done
102         [ x"$yesno" = x"y" ]
103 }
104
105 enter()
106 {
107         $2 cd "$1" || exit 1
108         check_mergeconflict "$1"
109 }
110
111 repos_urls="
112 .                             |                                                   | master      |
113 data/xonotic-data.pk3dir      |                                                   | master      |
114 data/xonotic-maps.pk3dir      |                                                   | master      |
115 data/xonotic-music.pk3dir     |                                                   | master      |
116 data/xonotic-nexcompat.pk3dir |                                                   | master      |
117 mediasource                   |                                                   | master      |
118 darkplaces                    |                                                   | div0-stable | svn
119 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
120 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
121 netradiant                    |                                                   | master      |
122 "
123 # todo: in darkplaces, change repobranch to div0-stable
124
125 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
126
127 base=`git config remote.origin.url`
128 case "$base" in
129         */xonotic.git)
130                 base=${base%xonotic.git}
131                 ;;
132         *)
133                 echo "The main repo is not xonotic.git, what have you done?"
134                 exit 1
135                 ;;
136 esac
137
138 repourl()
139 {
140         repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
141         if [ -n "$repo_t" ]; then
142                 case "$repo_t" in
143                         *://*)
144                                 echo "$repo_t"
145                                 ;;
146                         *)
147                                 echo "$base$repo_t"
148                                 ;;
149                 esac
150         else
151                 if [ x"$1" = x"." ]; then
152                         echo "$base""xonotic.git"
153                 else
154                         echo "$base${1##*/}.git"
155                 fi
156         fi
157 }
158
159 repobranch()
160 {
161         repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
162         if [ -n "$repo_t" ]; then
163                 echo "$repo_t"
164         else
165                 echo "master"
166         fi
167 }
168
169 repoflags()
170 {
171         echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
172 }
173
174 repos=`for d in $repos; do
175         p="${d%dir}"
176         if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
177                 echo "$d"
178         fi
179 done`
180
181 if [ "$#" = 0 ]; then
182         set -- help
183 fi
184 cmd=$1
185 shift
186
187 case "$cmd" in
188         update|pull)
189                 allow_pull=true
190                 if [ x"$1" = x"-N" ]; then
191                         allow_pull=false
192                 fi
193                 for d in $repos; do
194                         url=`repourl "$d"`
195                         branch=`repobranch "$d"`
196                         if [ -d "$d0/$d" ]; then
197                                 if $allow_pull; then
198                                         enter "$d0/$d" verbose
199                                         verbose git config remote.origin.url "$url"
200                                         verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
201
202                                         verbose git config remote.origin.autocrlf input
203
204                                         r=`git symbolic-ref HEAD`
205                                         r=${r#refs/heads/}
206                                         if git config branch.$r.remote >/dev/null 2>&1; then
207                                                 if ! verbose git pull; then
208                                                         check_mergeconflict "$d"
209                                                         echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
210                                                         read -r DUMMY
211                                                 fi
212                                         fi
213
214                                         cd "$d00"
215                                         checkself "$cmd" "$@"
216                                         cd "$d0/$d"
217                                         verbose git remote prune origin
218                                         cd "$d0"
219                                 fi
220                         else
221                                 verbose git clone "$url" "$d0/$d"
222                                 enter "$d0/$d" verbose
223                                 if [ "$branch" != "master" ]; then
224                                         verbose git checkout --track -b "$branch" origin/"$branch"
225                                 fi
226                                 cd "$d0"
227                         fi
228                 done
229                 ;;
230         update-maps)
231                 misc/tools/xonotic-map-compiler-autobuild download
232                 ;;
233         checkout|switch)
234                 remote=$1
235                 branch=$2
236                 if [ -z "$branch" ]; then
237                         case "$remote" in
238                                 origin/*)
239                                         branch=${remote#origin/}
240                                         remote=origin
241                                         ;;
242                                 *)
243                                         branch=$remote
244                                         remote=origin
245                                         ;;
246                         esac
247                 fi
248                 exists=false
249                 for d in $repos; do
250                         enter "$d0/$d" verbose
251                         b=$branch
252                         if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
253                                 exists=true
254                                 verbose git checkout "$b"
255                         elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
256                                 exists=true
257                                 verbose git checkout --track -b "$b" "$remote/$b"
258                         else
259                                 b=`repobranch "$d"`
260                                 if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
261                                         exists=true
262                                         verbose git checkout "$b"
263                                 elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
264                                         exists=true
265                                         verbose git checkout --track -b "$b" "$remote/$b"
266                                 else
267                                         echo "WTF? Not even branch $b doesn't exist in $d"
268                                         exit 1
269                                 fi
270                         fi
271                         cd "$d00"
272                         checkself "$cmd" "$@"
273                         cd "$d0"
274                 done
275                 if ! $exists; then
276                         echo "The requested branch was not found in any repository."
277                 fi
278                 exec "$SELF" branch
279                 ;;
280         branch)
281                 remote=$1
282                 branch=$2
283                 srcbranch=$3
284                 if [ -z "$branch" ]; then
285                         branch=$remote
286                         remote=origin
287                 fi
288                 if [ -z "$branch" ]; then
289                         for d in $repos; do
290                                 enter "$d0/$d"
291                                 r=`git symbolic-ref HEAD`
292                                 r=${r#refs/heads/}
293                                 echo "$d is at $r"
294                                 cd "$d0"
295                         done
296                 else
297                         for d in $repos; do
298                                 dv=`visible_repo_name "$d"`
299                                 enter "$d0/$d" verbose
300                                 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
301                                         echo "Already having this branch in $dv."
302                                 else
303                                         if yesno "Branch in $dv?"; then
304                                                 if [ -n "$srcbranch" ]; then
305                                                         b=$srcbranch
306                                                 else
307                                                         b=origin/"`repobranch "$d"`"
308                                                         verbose git fetch origin || true
309                                                 fi
310                                                 # TODO do this without pushing
311                                                 verbose git checkout -b "$branch" "$b"
312                                                 verbose git config "branch.$branch.remote" "$remote"
313                                                 verbose git config "branch.$branch.merge" "refs/heads/$branch"
314                                         fi
315                                 fi
316                                 cd "$d0"
317                         done
318                         "$SELF" branch
319                 fi
320                 ;;
321         branches)
322                 for d in $repos; do
323                         cd "$d0/$d" # am in a pipe, shouldn't use enter
324                         git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
325                         cd "$d0"
326                 done | {
327                         branches_list=
328                         # branches_repos_*=
329                         while read -r d BRANCH REV UPSTREAM TEXT; do
330                                 if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then
331                                         continue
332                                 fi
333                                 case "$UPSTREAM" in
334                                         \[*)
335                                                 UPSTREAM=${UPSTREAM#\[}
336                                                 UPSTREAM=${UPSTREAM%\]}
337                                                 UPSTREAM=${UPSTREAM%:*}
338                                                 ;;
339                                         *)
340                                                 TEXT="$UPSTREAM $TEXT"
341                                                 UPSTREAM=
342                                                 ;;
343                                 esac
344                                 if [ x"$REV" = x"->" ]; then
345                                         continue
346                                 fi
347                                 BRANCH=${BRANCH#remotes/}
348                                 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
349                                 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
350                                 eval "r=\$branches_repos_$ID"
351                                 case "$UPSTREAM" in
352                                         '')
353                                                 r="$r $d"
354                                                 ;;
355                                         *)
356                                                 r="$r $d:$UPSTREAM"
357                                                 ;;
358                                 esac
359                                 eval "branches_repos_$ID=\$r"
360                         done
361                         echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
362                                 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
363                                 eval "r=\$branches_repos_$ID"
364                                 printf "%-60s %s\n" "$BRANCH" "$r"
365                                 #echo "$BRANCH: $r"
366                         done
367                 }
368                 ;;
369         merge)
370                 for d in $repos; do
371                         dv=`visible_repo_name "$d"`
372                         enter "$d0/$d" verbose
373                         r=`git symbolic-ref HEAD`
374                         r=${r#refs/heads/}
375                         if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
376                                 # we have uncommitted changes
377                                 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
378                                         if ! verbose git merge origin/"`repobranch "$d"`"; then
379                                                 check_mergeconflict "$d"
380                                                 exit 1 # this should ALWAYS be fatal
381                                         fi
382                                 fi
383                         fi
384                         cd "$d0"
385                 done
386                 ;;
387         push|commit)
388                 submit=$1
389                 for d in $repos; do
390                         dv=`visible_repo_name "$d"`
391                         enter "$d0/$d" verbose
392                         r=`git symbolic-ref HEAD`
393                         r=${r#refs/heads/}
394                         diffdata=`git diff --color HEAD`
395                         if [ -n "$diffdata" ]; then
396                                 # we have uncommitted changes
397                                 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
398                                         verbose git commit -a
399                                 fi
400                         fi
401                         rem=`git config "branch.$r.remote" || echo origin`
402                         bra=`git config "branch.$r.merge" || echo "$r"`
403                         upstream="$rem/${bra#refs/heads/}"
404                         if ! git rev-parse "$upstream" >/dev/null 2>&1; then
405                                 upstream="origin/`repobranch "$d"`"
406                         fi
407                         logdata=`git log --color "$upstream".."$r"`
408                         if [ -n "$logdata" ]; then
409                                 if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
410                                         verbose git push "$rem" HEAD
411                                 fi
412                         fi
413                         if [ x"$submit" = x"-s" ]; then
414                                 case "$r" in
415                                         */*)
416                                                 verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
417                                                 ;;
418                                 esac
419                         fi
420                         cd "$d0"
421                 done
422                 ;;
423         compile)
424                 if [ -n "$WE_HATE_OUR_USERS" ]; then
425                         TARGETS="sv-debug cl-debug"
426                         if [ -z "$CC" ]; then
427                                 export CC=gcc
428                         fi
429                 elif [ x"`uname`" = x"Darwin" ]; then
430                         case "`uname -r`" in
431                                 ?.*)
432                                         TARGETS="sv-debug cl-debug sdl-debug"
433                                         ;;
434                                 *)
435                                         # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
436                                         TARGETS="sv-debug sdl-debug"
437                                         ;;
438                         esac
439                         export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
440                 else
441                         TARGETS="sv-debug cl-debug sdl-debug"
442                 fi
443                 case "$1" in
444                         -c)
445                                 cleandp=true
446                                 cleanqcc=true
447                                 cleanqc=true
448                                 shift
449                                 ;;
450                         -n)
451                                 cleandp=false
452                                 cleanqcc=false
453                                 cleanqc=false
454                                 shift
455                                 ;;
456                         *)
457                                 cleandp=false
458                                 cleanqcc=false
459                                 cleanqc=true # version info
460                                 ;;
461                 esac
462                 if [ -n "$1" ]; then
463                         TARGETS=
464                         for X in $1; do
465                                 case "$X" in
466                                         sdl)
467                                                 TARGETS="sdl-debug $TARGETS"
468                                                 ;;
469                                         glx|agl|wgl)
470                                                 TARGETS="cl-debug $TARGETS"
471                                                 ;;
472                                         dedicated)
473                                                 TARGETS="sv-debug $TARGETS"
474                                                 ;;
475                                 esac
476                         done
477                         shift
478                 fi
479                 if [ -z "$MAKEFLAGS" ]; then
480                         if [ -f /proc/cpuinfo ]; then
481                                 ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
482                                 if [ $ncpus -gt 1 ]; then
483                                         MAKEFLAGS=-j$ncpus
484                                 fi
485                         fi
486                         case "`uname`" in
487                                 Linux|*BSD)
488                                         MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
489                                         ;;
490                         esac
491                         if [ -n "$WE_HATE_OUR_USERS" ]; then
492                                 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
493                         fi
494                 fi
495
496                 enter "$d0/fteqcc" verbose
497                 if $cleanqcc; then
498                         verbose make $MAKEFLAGS clean
499                 fi
500                 verbose make $MAKEFLAGS
501
502                 enter "$d0/data/xonotic-data.pk3dir" verbose
503                 if $cleanqc; then
504                         verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
505                 fi
506                 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
507
508                 enter "$d0/darkplaces" verbose
509                 if $cleandp; then
510                         verbose make $MAKEFLAGS clean
511                 fi
512                 for T in $TARGETS; do
513                         verbose make $MAKEFLAGS "$@" "$T"
514                 done
515
516                 verbose "$SELF" update-maps
517                 ;;
518         run)
519                 if [ -n "$WE_HATE_OUR_USERS" ]; then
520                         client=
521                         export PATH="$d0/misc/buildfiles/w32:$PATH"
522                 elif [ x"`uname`" = x"Darwin" ]; then
523                         export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
524                         export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
525                         client=-sdl
526                 else
527                         client=-sdl
528                 fi
529                 case "$1" in
530                         sdl|glx|agl|dedicated)
531                                 client=-$1
532                                 shift
533                                 ;;
534                         wgl)
535                                 client=
536                                 shift
537                                 ;;
538                 esac
539                 if ! [ -x "darkplaces/darkplaces$client" ]; then
540                         if [ -x "darkplaces/darkplaces$client.exe" ]; then
541                                 client=$client.exe
542                         else
543                                 echo "Client darkplaces/darkplaces$client not found, aborting"
544                                 exit 1
545                         fi
546                 fi
547                 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
548
549                 # if pulseaudio is running: USE IT
550                 if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
551                         if ps -C pulseaudio >/dev/null; then
552                                 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
553                                         export SDL_AUDIODRIVER=pulse
554                                 fi
555                         fi
556                 fi
557
558                 if [ -n "$USE_GDB" ]; then
559                         set -- gdb --args "$@"
560                 fi
561                 "$@"
562                 ;;
563         each|foreach)
564                 keep_going=false
565                 if [ x"$1" = x"-k" ]; then
566                         keep_going=true
567                         shift
568                 fi
569                 for d in $repos; do
570                         if verbose cd "$d0/$d"; then
571                                 if $keep_going; then
572                                         verbose "$@" || true
573                                 else
574                                         verbose "$@"
575                                 fi
576                                 cd "$d0"
577                         fi
578                 done
579                 ;;
580         save-patches)
581                 outfile=$1
582                 patchdir=`mktemp -d -t save-patches.XXXXXX`
583                 for d in $repos; do
584                         enter "$d0/$d" verbose
585                         git branch -v -v | cut -c 3- | {
586                                 i=0
587                                 while read -r BRANCH REV UPSTREAM TEXT; do
588                                         case "$UPSTREAM" in
589                                                 \[*)
590                                                         UPSTREAM=${UPSTREAM#\[}
591                                                         UPSTREAM=${UPSTREAM%\]}
592                                                         UPSTREAM=${UPSTREAM%:*}
593                                                         TRACK=true
594                                                         ;;
595                                                 *)
596                                                         UPSTREAM=origin/"`repobranch "$d"`"
597                                                         TRACK=false
598                                                         ;;
599                                         esac
600                                         if [ x"$REV" = x"->" ]; then
601                                                 continue
602                                         fi
603                                         if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
604                                                 echo "$d" > "$patchdir/$i/info.txt"
605                                                 echo "$BRANCH" >> "$patchdir/$i/info.txt"
606                                                 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
607                                                 echo "$TRACK" >> "$patchdir/$i/info.txt"
608                                                 i=$(($i+1))
609                                         else
610                                                 rm -rf "$patchdir/$i"
611                                         fi
612                                 done
613                         }
614                 done
615                 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
616                 rm -rf "$patchdir"
617                 ;;
618         restore-patches)
619                 infile=$1
620                 patchdir=`mktemp -d -t restore-patches.XXXXXX`
621                 ( cd "$patchdir" && tar xvzf - ) < "$infile"
622                 # detach the head
623                 for P in "$patchdir"/*/info.txt; do
624                         D=${P%/info.txt}
625                         exec 3<"$P"
626                         read -r d <&3
627                         read -r BRANCH <&3
628                         read -r UPSTREAM <&3
629                         read -r TRACK <&3
630                         verbose git checkout HEAD^0
631                         verbose git branch -D "$BRANCH"
632                         if [ x"$TRACK" = x"true" ]; then
633                                 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
634                         else
635                                 verbose git branch -b "$BRANCH" "$UPSTREAM"
636                         fi
637                         verbose git am "$D"
638                 done
639                 rm -rf "$patchdir"
640                 ;;
641         admin-merge)
642                 branch=$1
643                 t=`mktemp`
644                 report=""
645                 reportecho()
646                 {
647                         report=$report"$*$LF"
648                         echo "$*"
649                 }
650                 reportecho4()
651                 {
652                         report=$report"    $*$LF"
653                         echo "    $*"
654                 }
655                 reportdo4()
656                 {
657                         o=`"$@" | sed 's/^/    /' || true`
658                         reportecho "$o"
659                 }
660                 for d in $repos; do
661                         enter "$d0/$d" verbose
662                         base="`repobranch "$d"`"
663                         reportecho "In $d:"
664                         for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
665                                 case "${ref#refs/remotes/origin/}" in
666                                         "$base")
667                                                 continue
668                                                 ;;
669                                         HEAD|master)
670                                                 continue
671                                                 ;;
672                                         */*)
673                                                 ;;
674                                         *)
675                                                 continue
676                                                 ;;
677                                 esac
678                                 if [ -n "$branch" ]; then
679                                         if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
680                                                 continue
681                                         fi
682                                 fi
683                                 case "$base" in
684                                         master)
685                                                 realbase=$base
686                                                 ;;
687                                         *)
688                                                 l0=`git rev-list "$base".."$ref" | wc -l`
689                                                 l1=`git rev-list master.."$ref" | wc -l`
690                                                 if [ $l0 -gt $l1 ]; then
691                                                         realbase=master
692                                                 else
693                                                         realbase=$base
694                                                 fi
695                                                 ;;
696                                 esac
697                                 reportecho "  Branch $ref:"
698                                 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
699                                 logdata=`git log --color "$realbase".."$ref"`
700                                 if [ -z "$logdata" ]; then
701                                         reportecho4 "--> not merging, no changes vs master"
702                                         if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; then
703                                                 git push origin :"${ref#refs/remotes/origin/}"
704                                                 reportecho4 "--> branch deleted"
705                                         fi
706                                 else
707                                         diffdata=`git diff --color --find-copies-harder --ignore-space-change "$realbase"..."$ref"`
708                                         if [ -z "$diffdata" ]; then
709                                                 reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
710                                                 if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
711                                                         git push origin :"${ref#refs/remotes/origin/}"
712                                                         reportecho4 "--> branch deleted"
713                                                 fi
714                                         elif [ -z "$branch" ] && [ -n "$note" ]; then
715                                                 reportdo4 echo "$note"
716                                                 reportecho4 "--> not merging, already had this one rejected before"
717                                         elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
718                                                 git checkout "$realbase"
719                                                 org=`git rev-parse HEAD`
720                                                 if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
721                                                         git reset --hard "$org"
722                                                         GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
723                                                         reportdo4 cat "$t"
724                                                         reportecho4 "--> merge failed"
725                                                 elif ! "$SELF" compile -n 2>&1 | tee "$t"; then
726                                                         git reset --hard "$org"
727                                                         GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
728                                                         reportdo4 cat "$t"
729                                                         reportecho4 "--> compile failed"
730                                                 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
731                                                         git reset --hard "$org"
732                                                         git notes edit "$ref"
733                                                         note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
734                                                         if [ x"$note" = x"del" ]; then
735                                                                 git push origin :"${ref#refs/remotes/origin/}"
736                                                                 reportecho4 "--> test failed, branch deleted"
737                                                         elif [ -n "$note" ]; then
738                                                                 reportdo4 echo "$note"
739                                                                 reportecho4 "--> test failed"
740                                                         else
741                                                                 reportecho4 "--> test failed, postponed"
742                                                         fi
743                                                 else
744                                                         echo "MERGING"
745                                                         case ",`repoflags "$d"`," in
746                                                                 *,svn,*)
747                                                                         # we do quite a mess here... luckily we know $org
748                                                                         git fetch # svn needs to be current
749                                                                         git rebase -i --onto origin/master "$org"
750                                                                         git svn dcommit --add-author-from
751                                                                         git reset --hard "$org"
752                                                                         ;;
753                                                                 *)
754                                                                         git push origin HEAD
755                                                                         ;;
756                                                         esac
757                                                         reportecho4 "--> MERGED"
758                                                         if yesno "Delete original branch \"$ref\"?"; then
759                                                                 git push origin :"${ref#refs/remotes/origin/}"
760                                                                 reportecho4 "--> branch deleted"
761                                                         fi
762                                                 fi
763                                         else
764                                                 GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
765                                                 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
766                                                 if [ x"$note" = x"del" ]; then
767                                                         git push origin :"${ref#refs/remotes/origin/}"
768                                                         reportecho4 "--> branch deleted"
769                                                 elif [ -n "$note" ]; then
770                                                         reportdo4 echo "$note"
771                                                         reportecho4 "--> rejected"
772                                                 else
773                                                         reportecho4 "--> postponed"
774                                                 fi
775                                         fi
776                                 fi
777                                 reportecho ""
778                         done
779                         reportecho ""
780                 done
781                 rm -f "$t"
782                 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
783                 ;;
784
785         # release building goes here
786         release-mkdir)
787                 mkdir -p Xonotic/"$1"
788                 ;;
789         release-prepare)
790 #"$SELF" each git clean -fxd
791                 mkdir -p Xonotic
792                 "$SELF" release-copy Docs/
793                 "$SELF" release-copy misc/
794                 "$SELF" release-copy server/
795                 "$SELF" release-copy xonotic-linux-glx.sh
796                 "$SELF" release-copy xonotic-linux-sdl.sh
797                 "$SELF" release-mkdir data
798                 "$SELF" release-mkdir fteqcc
799                 ;;
800         release-copy)
801                 rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
802                 ;;
803         release-compile-run)
804                 host=$1
805                 buildpath=$2
806                 maketargets=$3
807                 makeflags=$4
808                 srcdir=$5
809                 targetfiles=$6
810                 rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
811                 ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
812         for f in $targetfiles; do
813                         rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
814                 done
815                 ;;
816         release-compile)
817                 suffix=$1
818                 makeflags=$2
819                 fteqcc_maketargets=$3
820                 fteqcc_files=$4
821                 darkplaces_maketargets=$5
822                 darkplaces_files=$6
823                 "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
824                 "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
825                 ;;
826         release-engine-win32)
827                 rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
828                 "$SELF" release-compile win32 \
829                         '"DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/db.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
830                         win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
831                         debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
832                 ;;
833         release-engine-win64)
834                 rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
835                 "$SELF" release-compile win32 \
836                         '"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/db.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \
837                         win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
838                         debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'
839                 ;;
840         release-engine-osx)
841                 rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
842                 "$SELF" release-compile osx \
843                         'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib"' \
844                         all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
845                         sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
846                 ;;
847         release-engine-linux32)
848                 "$SELF" release-compile linux32 \
849                         'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \
850                         all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
851                         debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated'
852                 ;;
853         release-engine-linux64)
854                 "$SELF" release-compile linux64 \
855                         'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \
856                         all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
857                         debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated'
858                 ;;
859         release-engine)
860                 "$SELF" release-engine-win32 &
861                 "$SELF" release-engine-win64 &
862                 "$SELF" release-engine-osx &
863                 "$SELF" release-engine-linux32 &
864                 "$SELF" release-engine-linux64 &
865                 wait
866                 ;;
867         release-maps)
868                 "$SELF" update-maps
869                 for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
870                         if [ -f "$X" ]; then
871                                 cd Xonotic/data/xonotic-maps.pk3dir
872                                 unzip ../../../"$X"
873                                 cd ../../..
874                         fi
875                 done
876                 ;;
877         release-finish)
878                 # version numnber and stuff like that
879                 ;;
880         release-qc)
881                 verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
882                 ;;
883         release-buildpk3-transform-raw)
884                 dir=$1
885                 ;;
886         release-buildpk3-transform-normal)
887                 dir=$1
888                 cd "$dir"
889                 # texture: convert to jpeg and dds
890                 export do_jpeg=true
891                 export jpeg_qual_rgb=95
892                 export jpeg_qual_a=99
893                 export do_dds=true
894                 export dds_flags=
895                 export do_ogg=false
896                 find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
897                 ;;
898         release-buildpk3-transform-low)
899                 dir=$1
900                 cd "$dir"
901                 # texture: convert to jpeg and dds
902                 # music: reduce bitrate
903                 export do_jpeg=true
904                 export jpeg_qual_rgb=95
905                 export jpeg_qual_a=99
906                 export do_dds=false
907                 export do_ogg=true
908                 export ogg_qual=1
909                 find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
910                 ;;
911         release-buildpk3)
912                 src=$1
913                 dst=$2
914                 transform=$3
915                 case "$dst" in
916                         /*)
917                                 ;;
918                         */)
919                                 dst="$PWD/$dst"
920                                 ;;
921                 esac
922                 rm -rf Xonotic/temp
923                 rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
924                 "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
925                 cd Xonotic/temp
926                 zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
927                 cd ../..
928                 rm -rf Xonotic/temp
929                 ;;
930         release-buildpk3s)
931                 src=$1
932                 shift
933                 while [ "$#" -gt 1 ]; do
934                         "$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
935                         shift
936                         shift
937                 done
938                 ;;
939         release-pack)
940                 "$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
941                 "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
942                 "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
943                 "$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
944                 "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
945                 ;;
946         release)
947                 "$SELF" release-prepare
948                 "$SELF" release-maps
949                 "$SELF" release-finish
950                 "$SELF" release-qc
951                 "$SELF" release-pack
952                 "$SELF" release-engine
953                 ;;
954         *)
955                 echo "Usage:"
956                 echo "  $SELF pull"
957                 echo "  $SELF merge"
958                 echo "  $SELF push [-s]"
959                 echo "  $SELF branches"
960                 echo "  $SELF branch [<remote>] <branchname>"
961                 echo "  $SELF branch <remote> <branchname> <srcbranchname>"
962                 echo "  $SELF checkout [<remote>] <branchname>"
963                 echo "  $SELF compile [-c|-n] [<client>] <options>"
964                 echo "  $SELF run [<client>] <options>"
965                 echo "  $SELF each <command>"
966                 ;;
967 esac