summaryrefslogtreecommitdiff
path: root/source4/VERSION
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-05-08 08:27:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:44 -0500
commit721270ebad0a80fd3a608c4a6bd8c4218c6b774a (patch)
tree8cd055c4d83c23b9cb27fc0499b5114e171dfdf6 /source4/VERSION
parent2a8925ad2509e1e777e4eb3e7712a5cf68847ab5 (diff)
downloadsamba-721270ebad0a80fd3a608c4a6bd8c4218c6b774a.tar.gz
samba-721270ebad0a80fd3a608c4a6bd8c4218c6b774a.tar.bz2
samba-721270ebad0a80fd3a608c4a6bd8c4218c6b774a.zip
r15510: As discussed on samba-technical, move the VERSION system back to a
#define based system only. This avoids allocation in the fault code. Andrew Bartlett (This used to be commit 31c97b4e67ba6a188d0ed4844ca4f2f86f29514f)
Diffstat (limited to 'source4/VERSION')
-rw-r--r--source4/VERSION18
1 files changed, 3 insertions, 15 deletions
diff --git a/source4/VERSION b/source4/VERSION
index 75b1abbd20..79169839c0 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -74,7 +74,7 @@ SAMBA_VERSION_RC_RELEASE=
# in the development BRANCH, and set to 'no' only in #
# the SAMBA_X_X_RELEASE BRANCH #
# #
-# <MAJOR>.<MINOR>.<RELEASE>[...]cvs #
+# <MAJOR>.<MINOR>.<RELEASE>[...]-SVN-build-xxx #
# #
# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes #
# -> "3.0.0-SVN-build-199" #
@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
########################################################
# This is for specifying a release nickname #
# #
-# e.g. SAMBA_VERSION_RELEASE_NICKNAME="Nicky Nickname" #
+# e.g. SAMBA_VERSION_RELEASE_NICKNAME=Nicky Nickname #
# smbd --version will then give: #
# -> "4.0.0-tp1-VendorVersion (Nicky Nickname)" #
########################################################
@@ -99,21 +99,9 @@ SAMBA_VERSION_RELEASE_NICKNAME=
# #
# Note the '-' is automaticaly added #
# #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX="VendorVersion" #
+# e.g. SAMBA_VERSION_VENDOR_SUFFIX=VendorVersion #
# -> "CVS 3.0.0rc2-VendorVersion" #
# #
-# Note: If you want to use a function, #
-# then patch lib/version.c and add this function #
-# there, because the symbol must be available in #
-# binary. #
-# #
-# const char *vendor_version(void) #
-# { #
-# return "VendorVersion"; #
-# } #
-# #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
-# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
SAMBA_VERSION_VENDOR_SUFFIX=
SAMBA_VERSION_VENDOR_PATCH=