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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 874d4f39a15d3c88638715448c5e1333531035a9..468406bea678a288ef400cf36a516077cb605056 100755 (executable)
--- a/all
+++ b/all
@@ -903,17 +903,21 @@ case "$cmd" in
                                        verbose eval make clean $maketargets $makeflags
                                )
                                for f in $targetfiles; do
-                                       verbose mv "$buildpath/${f%:*}" "${f##*:}"
+                                       verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
                                done
                                ;;
                        *)
                                rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
                                verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
                                for f in $targetfiles; do
-                                       verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+                                       verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}" || true
                                done
                                ;;
                esac
+               # now rebrand the binaries...
+               for f in $targetfiles; do
+                       verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
+               done
                ;;
        release-compile)
                suffix=$1
@@ -966,9 +970,6 @@ case "$cmd" in
        release-maps)
                "$SELF" update-maps
                ;;
-       release-finish)
-               # version number and stuff like that
-               ;;
        release-qc)
                verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
                ;;
@@ -1008,6 +1009,9 @@ case "$cmd" in
                # texture: convert to jpeg and dds
                # music: reduce bitrate
                export do_jpeg=false
+               export do_jpeg_if_not_dds=true
+               export jpeg_qual_rgb=80
+               export jpeg_qual_a=95
                export do_dds=true
                export dds_flags=
                export do_ogg=true
@@ -1078,7 +1082,7 @@ case "$cmd" in
                dst=${src%.pk3dir}
                case "$dst" in
                        data/xonotic-*)
-                               dst="xonotic-$stamp-${dst#data/xonotic-}"
+                               dst="data/xonotic-$stamp-${dst#data/xonotic-}"
                                ;;
                        *)
                                dst="$dst-$stamp"
@@ -1108,6 +1112,7 @@ case "$cmd" in
                esac
                ;;
        release-zip)
+               stamp=`cat Xonotic/stamp.txt`
                zip -9r Xonotic-common.zip \
                        Xonotic/*.dll \
                        Xonotic/darkplaces-src \
@@ -1118,40 +1123,39 @@ case "$cmd" in
                        Xonotic/server \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
-                       Xonotic/data/font-nimbussansl.pk3
+                       Xonotic/data/font-nimbussansl-$stamp.pk3
                cp Xonotic-common.zip Xonotic.zip
                zip -0r Xonotic.zip \
-                       Xonotic/data/xonotic-data.pk3 \
-                       Xonotic/data/xonotic-maps.pk3 \
-                       Xonotic/data/xonotic-music.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+                       Xonotic/data/xonotic-$stamp-data.pk3 \
+                       Xonotic/data/xonotic-$stamp-maps.pk3 \
+                       Xonotic/data/xonotic-$stamp-music.pk3 \
+                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
                cp Xonotic-common.zip Xonotic-low.zip
                zip -0r Xonotic-low.zip \
-                       Xonotic/data/xonotic-data-low.pk3 \
-                       Xonotic/data/xonotic-maps-low.pk3 \
-                       Xonotic/data/xonotic-music-low.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+                       Xonotic/data/xonotic-$stamp-data-low.pk3 \
+                       Xonotic/data/xonotic-$stamp-maps-low.pk3 \
+                       Xonotic/data/xonotic-$stamp-music-low.pk3 \
+                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
                cp Xonotic-common.zip Xonotic-lowdds.zip
                zip -0r Xonotic-lowdds.zip \
-                       Xonotic/data/xonotic-data-lowdds.pk3 \
-                       Xonotic/data/xonotic-maps-lowdds.pk3 \
-                       Xonotic/data/xonotic-music-low.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+                       Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
+                       Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
+                       Xonotic/data/xonotic-$stamp-music-low.pk3 \
+                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
                cp Xonotic-common.zip Xonotic-high.zip
                zip -0r Xonotic-high.zip \
-                       Xonotic/data/xonotic-data-raw.pk3 \
-                       Xonotic/data/xonotic-maps-raw.pk3 \
-                       Xonotic/data/xonotic-music.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+                       Xonotic/data/xonotic-$stamp-data-raw.pk3 \
+                       Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
+                       Xonotic/data/xonotic-$stamp-music.pk3 \
+                       Xonotic/data/xonotic-$stamp-nexcompat.pk3
                rm -f Xonotic-common.zip
                ;;
        release)
                "$SELF" release-prepare
                "$SELF" release-maps &
                "$SELF" release-engine &
-               "$SELF" release-finish &
-               "$SELF" release-qc &
                wait
+               "$SELF" release-qc
                "$SELF" release-pack-needsx11
                "$SELF" release-zip
                ;;