git config --unset again

[xonotic/xonotic.git] / all

diff --git a/all b/all
index daf164cdf06636945c59cac4e8c2e6c5ba099cb1..35f09f9d2e3aa1aa8c73d727c2503a953511b3c9 100755 (executable)
--- a/all
+++ b/all
@@ -110,17 +110,17 @@ enter()
 }
 
 repos_urls="
-.                             |                                                   | master      |
-data/xonotic-data.pk3dir      |                                                   | master      |
-data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      | no
-darkplaces                    |                                                   | div0-stable | svn
-netradiant                    |                                                   | master      |
-div0-gittools                 |                                                   | master      | no
-d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
-data/xonotic-maps.pk3dir      |                                                   | master      |
-mediasource                   |                                                   | master      | no
-fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
+.                             |                                                   | master         |
+data/xonotic-data.pk3dir      |                                                   | master         |
+data/xonotic-music.pk3dir     |                                                   | master         |
+data/xonotic-nexcompat.pk3dir |                                                   | master         | no
+darkplaces                    |                                                   | div0-stable    | svn
+netradiant                    |                                                   | master         |
+div0-gittools                 |                                                   | master         | no
+d0_blind_id                   |                                                   | master         |
+data/xonotic-maps.pk3dir      |                                                   | master         |
+mediasource                   |                                                   | master         | no
+fteqcc                        |                                                   | xonotic-stable | noautocrlf
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -308,12 +308,19 @@ fix_git_config()
                verbose git config --unset remote.origin.pushurl || true
        fi
        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-       verbose git config core.autocrlf input
-       if [ -z "`git config push.default`" ]; then
+       case ",`repoflags "$d"`," in
+               *,noautocrlf,*)
+                       verbose git config --unset core.autocrlf || true
+                       ;;
+               *)
+                       verbose git config core.autocrlf input
+                       ;;
+       esac
+       if [ -z "`git config push.default || true`" ]; then
                verbose git config push.default current # or is tracking better?
        fi
-       git config filter.mapclean.clean "grep ^[^/]"
-       git config filter.mapclean.smudge "cat"
+       verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
+       verbose git config filter.mapclean.smudge "cat"
 }
 
 mkzip()
@@ -704,6 +711,7 @@ case "$cmd" in
                cleanqc=false
                compiled0=false
                debug=debug
+               snowleopardhack=false
                if [ -z "$CC" ]; then
                        export CC="gcc -DSUPPORTIPV6"
                fi
@@ -711,6 +719,7 @@ case "$cmd" in
                        case "$1" in
                                -0)
                                        compiled0=true
+                                       shift
                                        ;;
                                -c)
                                        cleand0=true
@@ -738,6 +747,7 @@ case "$cmd" in
                                        ;;
                                *)
                                        # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+                                       snowleopardhack=true
                                        TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
@@ -759,7 +769,13 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-debug"
                                                ;;
-                                       glx|agl|wgl)
+                                       agl)
+                                               TARGETS="$TARGETS cl-debug"
+                                               if $snowleopardhack; then
+                                                       export CC="$CC -arch i386"
+                                               fi
+                                               ;;
+                                       glx|wgl)
                                                TARGETS="$TARGETS cl-debug"
                                                ;;
                                        dedicated)
@@ -1166,33 +1182,33 @@ case "$cmd" in
                #   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
                #   ./all clean --reclone
                found=false
-               while :; do
-                       if [ x"$1" = x"--reclone" ]; then
+               for X in "$@"; do
+                       if [ x"$X" = x"--reclone" ]; then
                                force=true
                                fetchupstream=true
                                gotoupstream=true
                                gotomaster=true
                                rmuntracked=true
                                killbranches=true
-                       elif [ x"$1" = x"-f" ]; then
+                       elif [ x"$X" = x"-f" ]; then
                                force=true
-                       elif [ x"$1" = x"-u" ]; then
+                       elif [ x"$X" = x"-u" ]; then
                                gotoupstream=true
-                       elif [ x"$1" = x"-U" ]; then
+                       elif [ x"$X" = x"-U" ]; then
                                gotoupstream=true
                                fetchupstream=true
-                       elif [ x"$1" = x"-fu" ]; then
+                       elif [ x"$X" = x"-fu" ]; then
                                force=true
                                gotoupstream=true
-                       elif [ x"$1" = x"-fU" ]; then
+                       elif [ x"$X" = x"-fU" ]; then
                                force=true
                                gotoupstream=true
                                fetchupstream=true
-                       elif [ x"$1" = x"-m" ]; then
+                       elif [ x"$X" = x"-m" ]; then
                                gotomaster=true
-                       elif [ x"$1" = x"-r" ]; then
+                       elif [ x"$X" = x"-r" ]; then
                                rmuntracked=true
-                       elif [ x"$1" = x"-D" ]; then
+                       elif [ x"$X" = x"-D" ]; then
                                killbranches=true
                        else
                                break
@@ -1261,6 +1277,7 @@ case "$cmd" in
                                git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
                                git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
                        fi
+                       checkself "$cmd" "$@"
                done
                ;;
 
@@ -1395,9 +1412,9 @@ case "$cmd" in
                        # now rebrand the binaries...
                        for f in $targetfiles; do
                                #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
-                               case "$f" in
+                               case "${f##*:}" in
                                        xonotic*.exe)
-                                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+                                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
                                                (
                                                        d=`mktemp -d -t rebrand.XXXXXX`
                                                        cd "$d"
@@ -1406,7 +1423,7 @@ case "$cmd" in
                                                        cat darkplaces.zip
                                                        cd "$d0"
                                                        rm -rf "$d"
-                                               ) >> "$f"
+                                               ) >> "${f##*:}"
                                                ;;
                                esac
                        done
@@ -1517,7 +1534,7 @@ case "$cmd" in
                # music: reduce bitrate
                verbose export do_jpeg=true
                verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=95
+               verbose export jpeg_qual_a=99
                verbose export do_dds=false
                verbose export do_ogg=true
                verbose export ogg_qual=1
@@ -1532,7 +1549,7 @@ case "$cmd" in
                verbose export do_jpeg=false
                verbose export do_jpeg_if_not_dds=true
                verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=95
+               verbose export jpeg_qual_a=99
                verbose export do_dds=true
                verbose export dds_flags=
                verbose export do_ogg=true