force the linking

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 5a499dd36654aaa812b6eb2dcf204d57f32c9936..7beec5b4e47f0d214c8d4fd226e23cf7314da2ff 100755 (executable)
--- a/all
+++ b/all
@@ -1156,6 +1156,13 @@ case "$cmd" in
                ;;
        admin-merge)
                branch=$1
+               only_delete=false
+               case "$branch" in
+                       -d)
+                               branch=
+                               only_delete=true
+                               ;;
+               esac
                t=`mktemp`
                report=""
                reportecho()
@@ -1233,6 +1240,8 @@ case "$cmd" in
                                                        git push origin :"${ref#refs/remotes/origin/}"
                                                        reportecho4 "--> branch deleted"
                                                fi
+                                       elif $only_delete; then
+                                               reportecho4 "--> skipped in delete-only run"
                                        elif [ -z "$branch" ] && [ -n "$note" ]; then
                                                reportdo4 $ECHO "$note"
                                                reportecho4 "--> not merging, already had this one rejected before"
@@ -1661,7 +1670,7 @@ case "$cmd" in
                ;;
        release-qc)
                verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-               verbose rm -f Xonotic/source/*/fteqcc.log
+               verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
                dir=$1