svn commit: samba r9038 - branches/SAMBA_3_0/source
branches/SAMBA_3_0/source/script branches/SAMBA_4_0/source
branches/SAMBA_4_0/source/script trunk/source trunk/source/script
lmuelle at samba.org
lmuelle at samba.org
Thu Aug 4 02:59:20 GMT 2005
Author: lmuelle
Date: 2005-08-04 02:59:19 +0000 (Thu, 04 Aug 2005)
New Revision: 9038
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9038
Log:
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
Modified:
branches/SAMBA_3_0/source/VERSION
branches/SAMBA_3_0/source/script/mkversion.sh
branches/SAMBA_4_0/source/VERSION
branches/SAMBA_4_0/source/script/mkversion.sh
trunk/source/VERSION
trunk/source/script/mkversion.sh
Changeset:
Modified: branches/SAMBA_3_0/source/VERSION
===================================================================
--- branches/SAMBA_3_0/source/VERSION 2005-08-04 02:51:26 UTC (rev 9037)
+++ branches/SAMBA_3_0/source/VERSION 2005-08-04 02:59:19 UTC (rev 9038)
@@ -22,6 +22,18 @@
SAMBA_VERSION_RELEASE=20
########################################################
+# 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> #
Modified: branches/SAMBA_3_0/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0/source/script/mkversion.sh 2005-08-04 02:51:26 UTC (rev 9037)
+++ branches/SAMBA_3_0/source/script/mkversion.sh 2005-08-04 02:59:19 UTC (rev 9038)
@@ -18,6 +18,8 @@
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 @@
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
Modified: branches/SAMBA_4_0/source/VERSION
===================================================================
--- branches/SAMBA_4_0/source/VERSION 2005-08-04 02:51:26 UTC (rev 9037)
+++ branches/SAMBA_4_0/source/VERSION 2005-08-04 02:59:19 UTC (rev 9038)
@@ -22,6 +22,18 @@
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> #
Modified: branches/SAMBA_4_0/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_4_0/source/script/mkversion.sh 2005-08-04 02:51:26 UTC (rev 9037)
+++ branches/SAMBA_4_0/source/script/mkversion.sh 2005-08-04 02:59:19 UTC (rev 9038)
@@ -18,6 +18,8 @@
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 @@
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
Modified: trunk/source/VERSION
===================================================================
--- trunk/source/VERSION 2005-08-04 02:51:26 UTC (rev 9037)
+++ trunk/source/VERSION 2005-08-04 02:59:19 UTC (rev 9038)
@@ -22,6 +22,18 @@
SAMBA_VERSION_RELEASE=2
########################################################
+# 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> #
Modified: trunk/source/script/mkversion.sh
===================================================================
--- trunk/source/script/mkversion.sh 2005-08-04 02:51:26 UTC (rev 9037)
+++ trunk/source/script/mkversion.sh 2005-08-04 02:59:19 UTC (rev 9038)
@@ -18,6 +18,8 @@
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 @@
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
More information about the samba-cvs
mailing list