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