Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index fb15fb02e97833392ec69c0c8ef49f706d42a4f3..bd561dde72a4ca59ef025b5719363aed50f15d00 100755 (executable)
--- a/all
+++ b/all
@@ -945,7 +945,11 @@ case "$cmd" in
                esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
-               verbose date +%Y%m%d > Xonotic/stamp.txt
+               if [ -n "$RELEASEDATE" ]; then
+                       verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+               else
+                       verbose date +%Y%m%d > Xonotic/stamp.txt
+               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
@@ -1226,6 +1230,7 @@ case "$cmd" in
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
                        Xonotic/xonotic.exe \
+                       Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose zip -0yr Xonotic-$stamp.zip \