actually, be a bit more friendly: extract the NetRadiant download. We'll 7za it anyway.

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 934169828d4e594fa77d7852e1a95bf27c1c1569..466abc1d5e8309ba70b5bdf220ee0e755fedfc5d 100755 (executable)
--- a/all
+++ b/all
@@ -504,7 +504,7 @@ case "$cmd" in
                                pushbase=ssh://xonotic@git.xonotic.org/
                        elif [ x"$1" = x"-ph" ]; then
                                fix_config=true
-                               pushbase=http://git.xonotic.org/login/
+                               pushbase=http://git.xonotic.org/login/xonotic/
                        elif [ x"$1" = x"-s" ]; then
                                fix_config=true
                                base=ssh://xonotic@git.xonotic.org/
@@ -1507,7 +1507,7 @@ case "$cmd" in
                fi
                verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
-                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id
+                       verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
                        verbose tar xvf -
                        verbose rm -rf misc/builddeps
                        verbose mv misc/buildfiles/win32/* . || true
@@ -1546,6 +1546,16 @@ case "$cmd" in
                        verbose sh autogen.sh
                }
                rm -f Xonotic/key_15.d0pk
+               {
+                       verbose cd mapping
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
+                       for X in *-7z.exe; do
+                               7za x "$X"
+                               rm -f "$X"
+                       done
+                       # TODO possibly include other tools?
+               }
                ;;
        release-compile-run)
                host=$1
@@ -1683,10 +1693,9 @@ case "$cmd" in
                verbose cd "$dir"
                # texture: convert to jpeg and dds
                verbose export do_jpeg=true
-               verbose export jpeg_qual_rgb=95
+               verbose export jpeg_qual_rgb=97
                verbose export jpeg_qual_a=99
-               verbose export do_dds=true
-               verbose export dds_flags=
+               verbose export do_dds=false
                verbose export do_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
@@ -1828,10 +1837,11 @@ case "$cmd" in
                ;;
        release-pack)
                verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir                  raw ''
+               verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir                     raw ''
                verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '-high'        low '-low' normaldds ''
                verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '-high'        low '-low' normaldds ''
                verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                     raw '' low '-low'
-               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                        low ''
+               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  normal '-high'                   normaldds ''
                ;;
        release-pack-needsx11)
                case "$DISPLAY" in
@@ -1871,7 +1881,8 @@ case "$cmd" in
                        Xonotic/fteqcc \
                        Xonotic/server \
                        Xonotic/key_0.d0pk \
-                       Xonotic/data/font-nimbussansl-$stamp.pk3
+                       Xonotic/data/font-nimbussansl-$stamp.pk3 \
+                       Xonotic/data/font-xolonium-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \
                        Xonotic/data/xonotic-$stamp-data.pk3 \
@@ -1888,7 +1899,10 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-data-high.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-high.pk3 \
                        Xonotic/data/xonotic-$stamp-music.pk3 \
-                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
+                       Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
+               verbose mkzip0 Xonotic-$stamp-mappingsuppport.zip \
+                       Xonotic/mapping \
+                       Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
                ;;
        release)
                verbose "$SELF" release-prepare