Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 19 Sep 2010 19:03:03 +0000 (21:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 19 Sep 2010 19:03:03 +0000 (21:03 +0200)
1  2 
all

diff --combined all
index 99a4847c10bd6bdc1b49e371eb5d1a1b65453fc3,3eae364dc7156bdbab425cea36d6930f3bad5fdf..cf02febbd36ab459e1fe03be9e079e3cb221c103
--- 1/all
--- 2/all
+++ b/all
@@@ -119,7 -119,6 +119,7 @@@ darkplaces                    
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  div0-gittools                 |                                                   | master      | no
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -439,26 -438,15 +439,15 @@@ case "$cmd" i
        branches)
                for d in $repos; do
                        cd "$d0/$d" # am in a pipe, shouldn't use enter
-                       git branch -a -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ,"
+                       git branch -r -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ,"
                        cd "$d0"
                done | {
                        branches_list=
                        # branches_repos_*=
-                       while read -r d BRANCH REV UPSTREAM TEXT; do
+                       while read -r d BRANCH REV TEXT; do
                                if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then
                                        continue
                                fi
-                               case "$UPSTREAM" in
-                                       \[*)
-                                               UPSTREAM=${UPSTREAM#\[}
-                                               UPSTREAM=${UPSTREAM%\]}
-                                               UPSTREAM=${UPSTREAM%:*}
-                                               ;;
-                                       *)
-                                               TEXT="$UPSTREAM $TEXT"
-                                               UPSTREAM=
-                                               ;;
-                               esac
                                if [ x"$REV" = x"->" ]; then
                                        continue
                                fi
                                ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
                                branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
                                eval "r=\$branches_repos_$ID"
-                               case "$UPSTREAM" in
-                                       '')
-                                               r="$r $d"
-                                               ;;
-                                       *)
-                                               r="$r $d:$UPSTREAM"
-                                               ;;
-                               esac
+                               r="$r $d"
                                eval "branches_repos_$ID=\$r"
                        done
                        echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
                fi
                case "$1" in
                        -c)
 +                              cleand0=true
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        *)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                        fi
                fi
  
 +              enter "$d0/d0_blind_id" verbose
 +              if ! [ -f Makefile ]; then
 +                      verbose sh autogen.sh
 +                      verbose ./configure
 +              fi
 +              if $cleand0; then
 +                      verbose make $MAKEFLAGS clean
 +              fi
 +              verbose make $MAKEFLAGS
 +
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/win32:$PATH"
 +                      export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
 -                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else
 +                      export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
                        client=-sdl
                fi
                case "$1" in
                ;;
        clean)
                force=false
-               if [ x"$1" = x"-f" ]; then
-                       force=true
+               gotoupstream=false
+               fetchupstream=false
+               gotomaster=false
+               rmuntracked=false
+               killbranches=false
+               # usage:
+               #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
+               #   ./all clean --reclone
+               found=false
+               while :; do
+                       if [ x"$1" = x"--reclone" ]; then
+                               force=true
+                               fetchupstream=true
+                               gotoupstream=true
+                               gotomaster=true
+                               rmuntracked=true
+                               killbranches=true
+                       elif [ x"$1" = x"-f" ]; then
+                               force=true
+                       elif [ x"$1" = x"-u" ]; then
+                               gotoupstream=true
+                       elif [ x"$1" = x"-U" ]; then
+                               gotoupstream=true
+                               fetchupstream=true
+                       elif [ x"$1" = x"-fu" ]; then
+                               force=true
+                               gotoupstream=true
+                       elif [ x"$1" = x"-fU" ]; then
+                               force=true
+                               gotoupstream=true
+                               fetchupstream=true
+                       elif [ x"$1" = x"-m" ]; then
+                               gotomaster=true
+                       elif [ x"$1" = x"-r" ]; then
+                               rmuntracked=true
+                       elif [ x"$1" = x"-D" ]; then
+                               killbranches=true
+                       else
+                               break
+                       fi
+                       found=true
+                       shift
+               done
+               if ! $found; then
+                       rmuntracked=true
                fi
                for d in $repos; do
                        verbose cd "$d0/$d"
-                       if $force; then
+                       if $gotoupstream; then
+                               if ! $force; then
+                                       msg "Must also use -f (delete local changes) when using -u"
+                                       exit 1
+                               fi
+                               if $gotomaster; then
+                                       if $fetchupstream; then
+                                               verbose git fetch origin
+                                       fi
+                                       verbose git checkout -f "`repobranch "$d"`"
+                                       verbose git reset --hard origin/"`repobranch "$d"`"
+                               else
+                                       r=`git symbolic-ref HEAD`
+                                       r=${r#refs/heads/}
+                                       rem=`git config "branch.$r.remote" || echo origin`
+                                       bra=`git config "branch.$r.merge" || echo "$r"`
+                                       upstream="$rem/${bra#refs/heads/}"
+                                       if $fetchupstream; then
+                                               verbose git fetch "$rem"
+                                       fi
+                                       if ! git rev-parse "$upstream" >/dev/null 2>&1; then
+                                               upstream="origin/`repobranch "$d"`"
+                                       fi
+                                       verbose git reset --hard "$upstream"
+                               fi
+                       elif $gotomaster; then
+                               if $force; then
+                                       verbose git checkout -f "`repobranch "$d"`"
+                                       verbose git reset --hard
+                               else
+                                       verbose git checkout "`repobranch "$d"`"
+                               fi
+                       elif $force; then
                                verbose git reset --hard
-                               #redundant# verbose git checkout-index -fa
                        fi
-                       case "$d" in
-                               .)
-                                       verbose git clean -df
-                                       ;;
-                               *)
-                                       verbose git clean -xdf
-                                       ;;
-                       esac
+                       if $rmuntracked; then
+                               case "$d" in
+                                       .)
+                                               verbose git clean -df
+                                               ;;
+                                       *)
+                                               verbose git clean -xdf
+                                               ;;
+                               esac
+                       fi
+                       if $killbranches; then
+                               git for-each-ref --format='%(refname)' refs/heads/ | while IFS= read -r B; do
+                                       if [ x"$B" != x"`git symbolic-ref HEAD`" ]; then
+                                               verbose git branch -D "${B#refs/heads/}"
+                                       fi
+                               done
+                       fi
                done
                ;;
  
                else
                        verbose date +%Y%m%d > Xonotic/stamp.txt
                fi
 -              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 +              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
                        verbose tar xvf -
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
 +                      verbose rm -rf misc/pki
                }
                {
                        verbose cd darkplaces
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }
 +              rm -f Xonotic/key_15.d0pk
                ;;
        release-compile-run)
                host=$1
                verbose "$SELF" release-compile win64 \
                        'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
-                       release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
+                       release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
                ;;
        release-engine-osx-sv-sdl)
                # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
 -                      'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
 +                      'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
                ;;
        release-engine-linux64)
                verbose "$SELF" release-compile linux64 \
 -                      'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
 +                      'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
                stamp=`cat Xonotic/stamp.txt`
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true
 -              # need to use infozip for these (+x bits)
 +              # let's pass crypto import laws of some nasty countries
 +              crypto_libs=`find Xonotic -name \*d0_rijndael\* -exec rm -f {} \;`
 +              if [ -n "$crypto_libs" ]; then
 +                      verbose mkzip Xonotic-$stamp-crypto.zip \
 +                              $crypto_libs
 +                      rm -f $crypto_libs
 +              fi
 +              # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \
 +                      Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \
  
        *)
                echo "Usage:"
-               echo "  $SELF pull"
-               echo "  $SELF merge"
-               echo "  $SELF push [-s]"
+               echo "  $SELF admin-merge [<branch>]"
+               echo "  $SELF branch <branch>"
+               echo "  $SELF branch <remote> <branch> [<srcbranch>]"
                echo "  $SELF branches"
-               echo "  $SELF branch [<remote>] <branchname>"
-               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
-               echo "  $SELF checkout [<remote>] <branchname>"
-               echo "  $SELF compile [-c|-n] [<client>] <options>"
-               echo "  $SELF run [<client>] <options>"
-               echo "  $SELF each <command>"
+               echo "  $SELF checkout|switch <branch>"
+               echo "  $SELF checkout|switch <remote>/<branch>"
+               echo "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
+               echo "  $SELF clean --reclone"
+               echo "  $SELF compile [-c]"
+               echo "  $SELF each|foreach [-k] command..."
+               echo "  $SELF fix_upstream_rebase"
+               echo "  $SELF merge"
+               echo "  $SELF push|commit [-s]"
+               echo "  $SELF release"
+               echo "  $SELF restore-patches"
+               echo "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+               echo "  $SELF save-patches"
+               echo "  $SELF update-maps"
+               echo "  $SELF update|pull [-N]"
                ;;
  esac