better distribute source code

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 9a5b07e3e5534d1e8386bdbbb5ac82ec5bc7534b..920ed66f907dd8762e81dc1c7984780ec6712694 100755 (executable)
--- a/all
+++ b/all
@@ -902,6 +902,7 @@ case "$cmd" in
                # usage:
                #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
                #   ./all clean --reclone
+               found=false
                while :; do
                        if [ x"$1" = x"--reclone" ]; then
                                force=true
@@ -920,7 +921,7 @@ case "$cmd" in
                        elif [ x"$1" = x"-fu" ]; then
                                force=true
                                gotoupstream=true
-                       elif [ x"$1" = x"-Fu" ]; then
+                       elif [ x"$1" = x"-fU" ]; then
                                force=true
                                gotoupstream=true
                                fetchupstream=true
@@ -933,8 +934,12 @@ case "$cmd" in
                        else
                                break
                        fi
+                       found=true
                        shift
                done
+               if ! $found; then
+                       rmuntracked=true
+               fi
                for d in $repos; do
                        verbose cd "$d0/$d"
                        if $gotoupstream; then
@@ -965,6 +970,7 @@ case "$cmd" in
                        elif $gotomaster; then
                                if $force; then
                                        verbose git checkout -f "`repobranch "$d"`"
+                                       verbose git reset --hard
                                else
                                        verbose git checkout "`repobranch "$d"`"
                                fi
@@ -1335,10 +1341,12 @@ case "$cmd" in
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
-                       Xonotic/xonotic.exe
+                       Xonotic/xonotic.exe \
+                       Xonotic/source/darkplaces/
                verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
                verbose mkzip Xonotic-$stamp-common.zip \
-                       Xonotic/source/*/ \
+                       Xonotic/source/fteqcc/ \
+                       Xonotic/source/qcsrc/ \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \
@@ -1378,15 +1386,24 @@ case "$cmd" in
 
        *)
                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