mirror of
https://github.com/samba-team/samba.git
synced 2025-02-03 13:47:25 +03:00
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)
This commit is contained in:
parent
9d7d5ea229
commit
df9b8edff5
@ -21,6 +21,18 @@ SAMBA_VERSION_MAJOR=3
|
||||
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 #
|
||||
# #
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user