X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2FVERSION;h=6a708dc7d024b2c1755e896f9c1bf21de1f93ae9;hb=1b28bf952b8a3e72abd97b42b126e75a530ce6ad;hp=4942012d06764c00a453a5810191d7638dae65ff;hpb=1c3ade4108837cf43d00b5f4f1513b09a450e7d0;p=samba.git diff --git a/source3/VERSION b/source3/VERSION index 4942012d067..6a708dc7d02 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -1,6 +1,12 @@ ######################################################## # SAMBA Version # # # +# Samba versions are as follows # +# 3.0.x New production series # +# 3.0.x{pre,rc}y Preview/Testing & RC # +# 3.0.x[a-z] Patch releases # +# 3.0.x[a-z]-VENDOR-z Vendor patch releases # +# # # script/mkversion.sh # # will use this file to create # # include/version.h # @@ -18,17 +24,16 @@ # -> "3.0.0" # ######################################################## SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=2 +SAMBA_VERSION_MINOR=5 +SAMBA_VERSION_RELEASE=18 ######################################################## -# If a official release has a serious bug # -# a security release will have 'a' sufffix # +# Bug fix releases use a letter for the patch revision # # # # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a # # -> "2.2.8a" # ######################################################## SAMBA_VERSION_REVISION= @@ -51,54 +56,22 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=2 - -######################################################## -# For 'beta' releases the version will be # -# # -# ..beta # -# # -# e.g. SAMBA_VERSION_BETA_RELEASE=3 # -# -> "3.0.0beta3" # -######################################################## -SAMBA_VERSION_BETA_RELEASE= - -######################################################## -# For 'alpha' releases the version will be # -# # -# ..alpha # -# # -# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # -# -> "4.0.0alpha1" # -######################################################## -SAMBA_VERSION_ALPHA_RELEASE= - -######################################################## -# For 'test' releases the version will be # -# # -# ..test # -# # -# e.g. SAMBA_VERSION_TEST_RELEASE=1 # -# -> "4.0.0test1" # -######################################################## -SAMBA_VERSION_TEST_RELEASE= +SAMBA_VERSION_RC_RELEASE= ######################################################## -# To mark CVS snapshots this should be set to 'yes' # +# To mark SVN snapshots this should be set to 'yes' # # in the development BRANCH, and set to 'no' only in # # the SAMBA_X_X_RELEASE BRANCH # # # # ..[...]cvs # # # -# e.g. SAMBA_VERSION_IS_CVS_SNAPSHOT=yes # -# -> "CVS 3.0.0rc2" # +# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # +# -> "3.0.0-SVN-build-199" # ######################################################## -SAMBA_VERSION_IS_CVS_SNAPSHOT=yes +SAMBA_VERSION_IS_GIT_SNAPSHOT=no ######################################################## # This can be set by vendors if they want... # -# This can be a string constant or a function which # -# returns a string (const char *) # # # # ..[...]- # # # @@ -107,17 +80,26 @@ SAMBA_VERSION_IS_CVS_SNAPSHOT=yes # 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. # +# Note: If you want to use a function, take a look at # +# SAMBA_VERSION_VENDOR_FUNCTION # +# # +######################################################## +SAMBA_VERSION_VENDOR_SUFFIX= +SAMBA_VERSION_VENDOR_PATCH= + +######################################################## +# This can be set by vendors if they want.. # +# This have to be a function which returns a string # +# (const char *). # +# # +# Patch for example lib/version.c and add something # +# like the following example: # # # -# const char *vendor_version(void) # +# const char *samba_vendor_version(void) # # { # -# return "VendorVersion"; # +# return SAMBA_VERSION_OFFICIAL_STRING "-ENREDO-1.0" # # } # # # -# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # -# -> "CVS 3.0.0rc2-VendorVersion" # +# -> "Version 3.2.0-ENREDO-1.0 # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX= +SAMBA_VERSION_VENDOR_FUNCTION=