workaround for windows to not compile the SDL binary, and default to WGL

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 0020c6c2351a136cc966bc072654b78ab486de09..9a0a6d0ca0041aafda51f3dc693d65dd34a57737 100755 (executable)
--- a/all
+++ b/all
@@ -23,6 +23,7 @@ case "$0" in
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh
+                               export WE_HATE_OUR_USERS=1
                                exec ../all.xonotic.sh "$@"
                                ;;
                esac
@@ -157,8 +158,8 @@ case "$cmd" in
                                verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
                                        # TODO remove this line later
 
-                               git config core.autocrlf input
-                               git config core.safecrlf true
+                               verbose git config core.autocrlf false
+                               verbose git config core.safecrlf false # we don't NEED that...
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
@@ -351,10 +352,16 @@ case "$cmd" in
                enter "$d0/darkplaces" verbose
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug
-               verbose make $MAKEFLAGS sdl-debug
+               if ! [ -n "$WE_HATE_OUR_USERS" ]; then
+                       verbose make $MAKEFLAGS sdl-debug
+               fi
                ;;
        run)
-               client=-sdl
+               if [ -n "$WE_HATE_OUR_USERS" ]; then
+                       client=
+               else
+                       client=-sdl
+               fi
                case "$1" in
                        sdl|glx|agl|dedicated)
                                client=-$1
@@ -444,6 +451,41 @@ case "$cmd" in
                done
                rm -rf "$patchdir"
                ;;
+       admin-merge)
+               for d in $repos; do
+                       enter "$d0/$d" verbose
+                       git rev-parse "$1/$2" || continue
+                       # 1. review
+                       {
+                               git log HEAD.."$1/$2"
+                               git diff HEAD..."$1/$2"
+                       } | less
+                       a=
+                       while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                               echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+                               read -r a
+                       done
+                       if [ x"$a" = x"y" ]; then
+                               git merge "$1/$2"
+                               cd "$d0"
+                               a=
+                               if ! "$SELF" compile; then
+                                       a=n
+                               fi
+                               cd "$d0/$d"
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       git push origin HEAD
+                                       git push "$1" :"$2"
+                               else
+                                       git reset --hard HEAD@{1}
+                               fi
+                       fi
+               done
+               ;;
        *)
                echo "Usage:"
                echo "  $SELF pull"