Merge remote branch 'origin/fruitiex/sev-skin'

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b2e91062d318bf028071af142124eff585e36a1d..cf7e101d3472e7fd9cf697583f5b1994d7173508 100755 (executable)
--- a/all
+++ b/all
@@ -261,6 +261,7 @@ case "$cmd" in
                                                else
                                                        b="`repobranch "$d"`"
                                                fi
+                                               # TODO do this without pushing
                                                verbose git push "$remote" "$b":"$branch"
                                                verbose git checkout --track -b "$branch" "$remote/$branch"
                                        fi
@@ -299,6 +300,43 @@ case "$cmd" in
                        done
                done
                ;;
+       branches_short)
+               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 ,"
+                       cd "$d0"
+               done | {
+                       branches_list=
+                       # branches_repos_*=
+                       while read -r d BRANCH REV UPSTREAM TEXT; do
+                               case "$UPSTREAM" in
+                                       \[*)
+                                               UPSTREAM=${UPSTREAM#\[}
+                                               UPSTREAM=${UPSTREAM%\]}
+                                               UPSTREAM=${UPSTREAM%:*}
+                                               ;;
+                                       *)
+                                               TEXT="$UPSTREAM $TEXT"
+                                               UPSTREAM=
+                                               ;;
+                               esac
+                               if [ x"$REV" = x"->" ]; then
+                                       continue
+                               fi
+                               BRANCH=${BRANCH#remotes/}
+                               ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+                               branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
+                               eval "r=\$branches_repos_$ID"
+                               r="$r $d:$UPSTREAM"
+                               eval "branches_repos_$ID=\$r"
+                       done
+                       echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
+                               ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+                               eval "r=\$branches_repos_$ID"
+                               echo "$BRANCH: $r"
+                       done
+               }
+               ;;
        merge)
                for d in $repos; do
                        dv=`visible_repo_name "$d"`
@@ -367,6 +405,15 @@ case "$cmd" in
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
+               case "$1" in
+                       -c)
+                               clean=true
+                               shift
+                               ;;
+                       *)
+                               clean=false
+                               ;;
+               esac
                case "$1" in
                        sdl)
                                TARGETS="sdl-debug"
@@ -388,20 +435,37 @@ case "$cmd" in
                                        MAKEFLAGS=-j$ncpus
                                fi
                        fi
+                       case "`uname`" in
+                               Linux|*BSD)
+                                       MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
+                                       ;;
+                       esac
                fi
                enter "$d0/fteqcc" verbose
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
                verbose make $MAKEFLAGS
                enter "$d0/data/xonotic-data.pk3dir" verbose
-               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
+               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
                enter "$d0/darkplaces" verbose
+               if $clean; then
+                       verbose make $MAKEFLAGS clean
+               fi
                for T in $TARGETS; do
-                       verbose make $MAKEFLAGS "$T"
+                       verbose make $MAKEFLAGS "$@" "$T"
                done
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
+               elif [ x"`uname`" = x"Darwin" ]; then
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       client=-sdl
                else
                        client=-sdl
                fi
@@ -498,6 +562,9 @@ case "$cmd" in
                rm -rf "$patchdir"
                ;;
        admin-merge)
+               if [ "$#" = 1 ]; then
+                       set -- "${1%%/*}" "${1#*/}"
+               fi
                for d in $repos; do
                        enter "$d0/$d" verbose
                        git rev-parse "$1/$2" || continue
@@ -541,8 +608,8 @@ case "$cmd" in
                echo "  $SELF branch [<remote>] <branchname>"
                echo "  $SELF branch <remote> <branchname> <srcbranchname>"
                echo "  $SELF checkout [<remote>] <branchname>"
-               echo "  $SELF compile"
-               echo "  $SELF run <client> <options>"
+               echo "  $SELF compile [-c] [<client>] <options>"
+               echo "  $SELF run [<client>] <options>"
                echo "  $SELF each <command>"
                ;;
 esac