Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d517457b05dc6b3750e92a9ef51d4961f418a1de..de482c746186eb173108dd34fd7f9cb27f2f8364 100755 (executable)
--- a/all
+++ b/all
@@ -235,6 +235,12 @@ listrepos()
                        $ECHO "$d"
                        continue
                fi
+               # remove broken clones so they don't mess up stuff
+               if [ x"$d" != x"." ] && [ -d "$d" ] && ! [ -d "$d/.git" ]; then
+                       msg "$d exists but has no .git subdir. Probably a broken clone. Deleting."
+                       verbose rm -rf "$d"
+                       continue
+               fi
                # if we have the dir, always keep it
                if [ -d "$d" ]; then
                        msg "Repository $d enabled because it already exists"
@@ -587,9 +593,12 @@ case "$cmd" in
                oldbase=$base
                oldpushbase=$pushbase
                # transition old URLs
-               if [ x"$base" = x"ssh://xonotic@push.git.xonotic.org/" ]; then
+               if [ x"$base" = x"ssh://xonotic@git.xonotic.org/" ]; then
                        base=ssh://xonotic@push.git.xonotic.org/
                fi
+               if [ x"$pushbase" = x"ssh://xonotic@git.xonotic.org/" ]; then
+                       pushbase=ssh://xonotic@push.git.xonotic.org/
+               fi
                while :; do
                        if [ x"$1" = x"-N" ]; then
                                allow_pull=false
@@ -1198,7 +1207,7 @@ case "$cmd" in
 
                if [ x"$USE_GDB" = x"yes" ]; then
                        set -- gdb --args "$@"
-               elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+               elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
                        set -- gdb --batch -x savecore.gdb --args "$@"
                elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"
@@ -1667,8 +1676,8 @@ case "$cmd" in
                rm -f Xonotic/key_15.d0pk
                {
                        verbose cd Xonotic/mapping
-                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819.tar.bz2
-                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114.tar.bz2
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe
                        for X in *-7z.exe; do
                                7za x "$X"
                                rm -f "$X"
@@ -1788,7 +1797,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+               verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
@@ -1802,7 +1811,8 @@ case "$cmd" in
                verbose export jpeg_qual_rgb=97
                verbose export jpeg_qual_a=99
                verbose export do_dds=false
-               verbose export do_ogg=false
+               verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
@@ -1818,6 +1828,7 @@ case "$cmd" in
                verbose export do_dds=true
                verbose export dds_flags=
                verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;