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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ea57da7141c8601d10a8647815e632fba3689689..f37a17f629c4cc5612daa5f3cc8bb1eabecd8e7d 100755 (executable)
--- a/all
+++ b/all
@@ -1437,13 +1437,7 @@ case "$cmd" in
        release-prepare)
                #"$SELF" each git clean -fxd
                case "$RELEASETYPE" in
-                       beta)
-                               msg "Building a BETA"
-                               ;;
-                       release)
-                               msg "Building a RELEASE"
-                               ;;
-                       *)
+                       '')
                                $ECHO >&2 -n "$ESC[2J$ESC[H"
                                msg ""
                                msg ""
@@ -1485,6 +1479,12 @@ case "$cmd" in
                                #   (YYYYMMDD)
                                exit 1
                                ;;
+                       release)
+                               msg "Building a FINISHED RELEASE"
+                               ;;
+                       *)
+                               msg "Building a $RELEASETYPE"
+                               ;;
                esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
@@ -1652,15 +1652,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               case "$RELEASETYPE" in
-                       beta)
-                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-                               # back out of: source/qcsrc/server
-                               ;;
-                       release)
-                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-                               ;;
-               esac
+               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
@@ -1741,8 +1733,10 @@ case "$cmd" in
                        patch=$(($gv - $major * 10000 - $minor * 100))
                        versionstr="$major.$minor.$patch"
                        case "$RELEASETYPE" in
-                               beta)
-                                       versionstr="$versionstr""beta"
+                               release)
+                                       ;;
+                               *)
+                                       versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
                        verbose sed -i "
@@ -1750,7 +1744,6 @@ case "$cmd" in
                                s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
                        " defaultXonotic.cfg
-                       release)
                        case "$RELEASETYPE" in
                                release)
                                        echo "" >> defaultXonotic.cfg
@@ -1855,12 +1848,6 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-data-low.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-low.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
-#              verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
-#              verbose mkzip0 Xonotic-$stamp-high.zip \
-#                      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
                verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
                verbose mkzip0 Xonotic-$stamp-lowdds.zip \
                        Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \