more windows fixes

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ef8b87df7496d7d28cee5df910b2161b1ac98510..6831cca65da48dc052c497c1f0072b51373ed351 100755 (executable)
--- a/all
+++ b/all
@@ -224,10 +224,9 @@ listrepos()
        for d in $repos; do
                p="${d%dir}"
                f="`repoflags "$d"`"
-               # if we have the dir, always keep it
-               if [ -d "$d" ]; then
-                       msg "Repository $d enabled because it already exists"
-                       $ECHO "$d"
+               # if we have .no file, skip
+               if [ -f "$d.no" ]; then
+                       msg "Repository $d disabled by a .no file, delete $d.no to enable"
                        continue
                fi
                # if .yes file exists, always keep it
@@ -236,9 +235,10 @@ listrepos()
                        $ECHO "$d"
                        continue
                fi
-               # if we have .no file, skip
-               if [ -f "$d.no" ]; then
-                       msg "Repository $d disabled by a .no file, delete $d.no to enable"
+               # if we have the dir, always keep it
+               if [ -d "$d" ]; then
+                       msg "Repository $d enabled because it already exists"
+                       $ECHO "$d"
                        continue
                fi
                # if we have matching pk3, skip
@@ -583,29 +583,33 @@ case "$cmd" in
                ;;
        update|pull)
                allow_pull=true
-               fix_config=false
                location=current
+               oldbase=$base
+               oldpushbase=$pushbase
+               # transition old URLs
+               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
                        elif [ x"$1" = x"-p" ]; then
-                               fix_config=true
-                               pushbase=ssh://xonotic@git.xonotic.org/
+                               pushbase=ssh://xonotic@push.git.xonotic.org/
                        elif [ x"$1" = x"-ps" ]; then
-                               fix_config=true
-                               pushbase=ssh://xonotic@git.xonotic.org/
+                               pushbase=ssh://xonotic@push.git.xonotic.org/
                        elif [ x"$1" = x"-ph" ]; then
-                               fix_config=true
-                               pushbase=http://git.xonotic.org/login/xonotic/
+                               pushbase=http://push.git.xonotic.org/login/xonotic/
                        elif [ x"$1" = x"-s" ]; then
-                               fix_config=true
-                               base=ssh://xonotic@git.xonotic.org/
+                               base=ssh://xonotic@push.git.xonotic.org/
                        elif [ x"$1" = x"-g" ]; then
-                               fix_config=true
                                base=git://git.xonotic.org/xonotic/
+                               location=best
                        elif [ x"$1" = x"-h" ]; then
-                               fix_config=true
                                base=http://git.xonotic.org/xonotic/
+                               location=best
                        elif [ x"$1" = x"-l" ]; then
                                case "$2" in
                                        nl) ;;
@@ -624,7 +628,6 @@ case "$cmd" in
                                                exit 1
                                                ;;
                                esac
-                               fix_config=true
                                location=$2
                                shift
                        else
@@ -681,17 +684,16 @@ case "$cmd" in
                esac
                if [ -n "$location" ]; then
                        base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
-                       pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
                else
                        base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
-                       pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
                fi
-               if $fix_config; then
+               pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://xonotic@push.git.xonotic.org/,"`
+               if [ x"$base" != x"$oldbase" ] || [ x"$pushbase" != x"$oldpushbase" ]; then
                        url=`repourl .`
                        pushurl=`repopushurl .`
                        fix_git_config "$url" "$pushurl"
-               fi
-               if $allow_pull || $fix_config; then
+                       "$SELF" fix_config
+               elif $allow_pull; then
                        "$SELF" fix_config
                fi
                for d in $repos; do
@@ -1199,7 +1201,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 "$@"
@@ -1668,8 +1670,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"
@@ -1789,7 +1791,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)
@@ -1803,7 +1805,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
                ;;
@@ -1819,6 +1822,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
                ;;
@@ -1953,6 +1957,8 @@ case "$cmd" in
                release_timereport "processed data"
                verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                release_timereport "transformed data"
+               find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh
+               release_timereport "deduplicated data"
                verbose mkzipr "../../$dst" *
                release_timereport "zipped data"
                verbose cd ../..
@@ -2019,9 +2025,7 @@ case "$cmd" in
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
-                       Xonotic/xonotic.exe \
-                       Xonotic/source/darkplaces/ \
-                       Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
+                       Xonotic/xonotic.exe
                verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
                verbose mkzip Xonotic-$stamp-common.zip \
                        Xonotic/source/fteqcc/ \
@@ -2033,6 +2037,11 @@ case "$cmd" in
                        Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3 \
                        Xonotic/data/font-xolonium-$stamp.pk3
+               verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip
+               verbose mkzip Xonotic-$stamp-source.zip \
+                       Xonotic/source/fteqcc/ \
+                       Xonotic/source/qcsrc/ \
+                       Xonotic/misc/logos
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \
                        Xonotic/data/xonotic-$stamp-data.pk3 \