summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-05 09:07:44 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-05 04:27:36 +0200
commitd561ef20b5f87bd3a77939de7175daca45679e29 (patch)
treefe6ae7c655563692f8913ef595cfc2a63dc31132
parent1a2b65cd31243f36f2a0a63bdad7f6d6f39afc1d (diff)
downloadsamba-d561ef20b5f87bd3a77939de7175daca45679e29.tar.gz
samba-d561ef20b5f87bd3a77939de7175daca45679e29.tar.bz2
samba-d561ef20b5f87bd3a77939de7175daca45679e29.zip
VERSION: prepare for beta1 by setting and parsing the beta version
-rw-r--r--VERSION12
-rw-r--r--buildtools/wafsamba/samba_version.py9
-rwxr-xr-xsource3/script/mkversion.sh4
3 files changed, 23 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 1dc74f24fd..9cfbd4e9cf 100644
--- a/VERSION
+++ b/VERSION
@@ -57,7 +57,17 @@ SAMBA_VERSION_TP_RELEASE=
# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 #
# -> "4.0.0alpha1" #
########################################################
-SAMBA_VERSION_ALPHA_RELEASE=22
+SAMBA_VERSION_ALPHA_RELEASE=
+
+########################################################
+# For 'alpha' releases the version will be #
+# #
+# <MAJOR>.<MINOR>.<RELEASE>beta<TP_RELEASE> #
+# #
+# e.g. SAMBA_VERSION_BETA_RELEASE=1 #
+# -> "4.0.0beta1" #
+########################################################
+SAMBA_VERSION_BETA_RELEASE=1
########################################################
# For 'pre' releases the version will be #
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 96d5d0d47d..9dae23a908 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -107,6 +107,7 @@ also accepted as dictionary entries here
self.REVISION=None
self.TP_RELEASE=None
self.ALPHA_RELEASE=None
+ self.BETA_RELEASE=None
self.PRE_RELEASE=None
self.RC_RELEASE=None
self.IS_SNAPSHOT=True
@@ -137,7 +138,7 @@ also accepted as dictionary entries here
SAMBA_VERSION_STRING = ("%u.%u.%u" % (self.MAJOR, self.MINOR, self.RELEASE))
##
-## maybe add "3.0.22a" or "4.0.0tp11" or "4.0.0alpha1" or "3.0.22pre1" or "3.0.22rc1"
+## maybe add "3.0.22a" or "4.0.0tp11" or "4.0.0alpha1" or "4.0.0beta1" or "3.0.22pre1" or "3.0.22rc1"
## We do not do pre or rc version on patch/letter releases
##
if self.REVISION is not None:
@@ -148,6 +149,9 @@ also accepted as dictionary entries here
if self.ALPHA_RELEASE is not None:
self.ALPHA_RELEASE = int(self.ALPHA_RELEASE)
SAMBA_VERSION_STRING += ("alpha%u" % self.ALPHA_RELEASE)
+ if self.BETA_RELEASE is not None:
+ self.BETA_RELEASE = int(self.BETA_RELEASE)
+ SAMBA_VERSION_STRING += ("beta%u" % self.BETA_RELEASE)
if self.PRE_RELEASE is not None:
self.PRE_RELEASE = int(self.PRE_RELEASE)
SAMBA_VERSION_STRING += ("pre%u" % self.PRE_RELEASE)
@@ -201,6 +205,9 @@ also accepted as dictionary entries here
if self.ALPHA_RELEASE is not None:
string+="#define SAMBA_VERSION_ALPHA_RELEASE %u\n" % self.ALPHA_RELEASE
+ if self.BETA_RELEASE is not None:
+ string+="#define SAMBA_VERSION_BETA_RELEASE %u\n" % self.BETA_RELEASE
+
if self.PRE_RELEASE is not None:
string+="#define SAMBA_VERSION_PRE_RELEASE %u\n" % self.PRE_RELEASE
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index e6b375e613..ef3582a546 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -20,6 +20,7 @@ SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION
SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
+SAMBA_VERSION_BETA_RELEASE=`sed -n 's/^SAMBA_VERSION_BETA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
@@ -55,6 +56,9 @@ if test -n "${SAMBA_VERSION_REVISION}";then
elif test -n "${SAMBA_VERSION_TP_RELEASE}";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}"
echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $OUTPUT_FILE
+elif test -n "${SAMBA_VERSION_BETA_RELEASE}";then
+ SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}beta${SAMBA_VERSION_BETA_RELEASE}"
+ echo "#define SAMBA_VERSION_BETA_RELEASE ${SAMBA_VERSION_BETA_RELEASE}" >> $OUTPUT_FILE
elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
## maybe add "3.0.22pre2"
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"