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