summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-29 21:01:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:37 -0500
commit405e08683da011411c447fc183a0492576421ede (patch)
treef55730bdde931b41bec0c1d90fce967438a5a05b /source4
parentaa68fbab880b6b13431807df43118ea1f21bb8c7 (diff)
downloadsamba-405e08683da011411c447fc183a0492576421ede.tar.gz
samba-405e08683da011411c447fc183a0492576421ede.tar.bz2
samba-405e08683da011411c447fc183a0492576421ede.zip
r412: as we decide to not do 3.0.2a releases anymore,
remove the generation stuff from VERSION and mkversion.sh metze (This used to be commit 6658e75358a82e3e6f104487d8bb19514af4e7a7)
Diffstat (limited to 'source4')
-rw-r--r--source4/VERSION12
-rwxr-xr-xsource4/script/mkversion.sh7
2 files changed, 1 insertions, 18 deletions
diff --git a/source4/VERSION b/source4/VERSION
index cdc04ab5af..4bf6f3e5db 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -22,18 +22,6 @@ 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 f66e1cc1ac..917a9ed1ae 100755
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -18,8 +18,6 @@ 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`
@@ -38,10 +36,7 @@ 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_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
+if 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