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