Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 06:44:40 +0000 (08:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 06:44:40 +0000 (08:44 +0200)
1  2 
all

diff --combined all
--- 1/all
--- 2/all
+++ b/all
@@@ -104,7 -104,7 +104,7 @@@ yesno(
  
  enter()
  {
-       $2 cd "$1"
+       $2 cd "$1" || exit 1
        check_mergeconflict "$1"
  }
  
@@@ -119,7 -119,6 +119,7 @@@ darkplaces                    
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -200,6 -199,8 +200,8 @@@ case "$cmd" i
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
  
+                                       verbose git config remote.origin.autocrlf input
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
        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,^,$d ,"
+                       git branch -a -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ,"
                        cd "$d0"
                done | {
                        branches_list=
                fi
                case "$1" in
                        -c)
 +                              cleand0=true
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        -n)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                                shift
                                ;;
                        *)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=true # version info
                                ;;
                esac
-               if [ -n "$1" ]; then
+               if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
+                       # if we give the command make the arg "", it will surely fail (invalid filename),
+                       # so better handle it as an empty client option
+                       BAD_TARGETS=" "
+                       shift
+               elif [ -n "$1" ]; then
+                       BAD_TARGETS=
+                       TARGETS_SAVE=$TARGETS
                        TARGETS=
                        for X in $1; do
                                case "$X" in
                                        sdl)
-                                               TARGETS="sdl-debug $TARGETS"
+                                               TARGETS="$TARGETS sdl-debug"
                                                ;;
                                        glx|agl|wgl)
-                                               TARGETS="cl-debug $TARGETS"
+                                               TARGETS="$TARGETS cl-debug"
                                                ;;
                                        dedicated)
-                                               TARGETS="sv-debug $TARGETS"
+                                               TARGETS="$TARGETS sv-debug"
+                                               ;;
+                                       *)
+                                               BAD_TARGETS="$BAD_TARGETS $X"
                                                ;;
                                esac
                        done
-                       shift
+                       if [ -n "$TARGETS" ]; then # at least a valid client
+                               shift
+                       else # no valid client, let's assume this option is not meant to be a client then
+                               TARGETS=$TARGETS_SAVE
+                               BAD_TARGETS=
+                       fi
                fi
                if [ -z "$MAKEFLAGS" ]; then
                        if [ -f /proc/cpuinfo ]; then
                        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
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
  
                enter "$d0/darkplaces" verbose
+               if [ x"$BAD_TARGETS" = x" " ]; then
+                       echo "Warning: invalid empty client, default clients will be used."
+               fi
                if $cleandp; then
                        verbose make $MAKEFLAGS clean
                fi
                for T in $TARGETS; do
                        verbose make $MAKEFLAGS "$@" "$T"
                done
+               for T in $BAD_TARGETS; do
+                       echo "Warning: discarded invalid client $T."
+               done
  
                verbose "$SELF" update-maps
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/w32:$PATH"
 +                      export PATH="$d0/misc/buildfiles/w32:$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
                                                        reportecho4 "--> compile failed"
                                                elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
                                                        git reset --hard "$org"
-                                                       git notes edit "$ref"
+                                                       GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
                                                        note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                                        if [ x"$note" = x"del" ]; then
                                                                git push origin :"${ref#refs/remotes/origin/}"