summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2005-08-04 02:59:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:10 -0500
commitdf9b8edff5c4015a06a12e13d14dd08c05ceb25c (patch)
tree0f1ce61178ba4c027087426a128e9d64e12a7434
parent9d7d5ea229cc12ac56d565f400990e7b56685a56 (diff)
downloadsamba-df9b8edff5c4015a06a12e13d14dd08c05ceb25c.tar.gz
samba-df9b8edff5c4015a06a12e13d14dd08c05ceb25c.tar.bz2
samba-df9b8edff5c4015a06a12e13d14dd08c05ceb25c.zip
r9038: Revert svn rev 414. Discussed with Jerry and Metze.
We need the option to add an 'a' if we're already in pre or rc state with the next release. Bugzilla Bug 2618 (This used to be commit 8e2be770aef55ef1d9a7ec45d189c96d231ae72a)
-rw-r--r--source4/VERSION12
-rwxr-xr-xsource4/script/mkversion.sh7
2 files changed, 18 insertions, 1 deletions
diff --git a/source4/VERSION b/source4/VERSION
index 4bf6f3e5db..cdc04ab5af 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -22,6 +22,18 @@ SAMBA_VERSION_MINOR=9
SAMBA_VERSION_RELEASE=0
########################################################
+# If a official release has a serious bug #
+# a security release will have 'a' sufffix #
+# #
+# so SAMBA's version will be #
+# <MAJOR>.<MINOR>.<RELEASE><REVISION> #
+# #
+# e.g. SAMBA_VERSION_PRE_RELEASE=a #
+# -> "2.2.8a" #
+########################################################
+SAMBA_VERSION_REVISION=
+
+########################################################
# For 'pre' releases the version will be #
# #
# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> #
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index d9d84a5337..9d919cfe34 100755
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -18,6 +18,8 @@ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FIL
SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
+SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//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`
@@ -36,7 +38,10 @@ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
-if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
+if test -n "${SAMBA_VERSION_REVISION}";then
+ SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
+ echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE
+elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
echo "#define SAMBA_VERSION_PRE_RELEASE ${SAMBA_VERSION_PRE_RELEASE}" >> $OUTPUT_FILE
elif test -n "${SAMBA_VERSION_RC_RELEASE}";then