From 1b10310dff80fba3f0496c3cc038d08b7587c5ee Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 14 Dec 2010 20:43:47 +0100 Subject: [PATCH] simplify RELEASETYPE handling --- all | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/all b/all index 35e23577..de82d83d 100755 --- 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 " -- 2.39.2