diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-01-23 11:23:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:23 -0500 |
| commit | 36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc (patch) | |
| tree | c20609c202d735fc7f0ebc8d3b9c3ecf4143a3d8 /source4/script | |
| parent | 9c9b42a5499dc381f43684ebd46b3bc1272d743c (diff) | |
| download | samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.tar.gz samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.tar.xz samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.zip | |
r13079: add SAMBA_VERSION_RELEASE_NICKNAME
if it's set in source/VERSION
smbd --version will print
4.0.0tp1 (Nickname)
metze
(This used to be commit 780870293b8109250b16101649f110ba22c1932b)
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/mkversion.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh index 8e5fea5c8b..814b47e9d0 100755 --- a/source4/script/mkversion.sh +++ b/source4/script/mkversion.sh @@ -19,14 +19,16 @@ SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//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` -SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` - SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' $SOURCE_DIR$VERSION_FILE` + SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE @@ -42,15 +44,15 @@ SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERS 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_TP_RELEASE}";then + SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}" + echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $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 SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}rc${SAMBA_VERSION_RC_RELEASE}" echo "#define SAMBA_VERSION_RC_RELEASE ${SAMBA_VERSION_RC_RELEASE}" >> $OUTPUT_FILE -elif test -n "${SAMBA_VERSION_TP_RELEASE}";then - SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-tp${SAMBA_VERSION_TP_RELEASE}" - echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $OUTPUT_FILE elif test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then _SAVE_LANG=${LANG} LANG="" @@ -79,6 +81,10 @@ elif test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then LANG=${_SAVE_LANG} fi +if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then + echo "#define SAMBA_VERSION_RELEASE_NICKNAME ${SAMBA_VERSION_RELEASE_NICKNAME}" >> $OUTPUT_FILE +fi + if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE fi @@ -89,6 +95,10 @@ echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE echo "$0: 'include/version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")" +if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then + echo "$0: with RELEASE_NICKNAME = ${SAMBA_VERSION_RELEASE_NICKNAME}" +fi + if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then echo "$0: with VENDOR_SUFFIX = ${SAMBA_VERSION_VENDOR_SUFFIX}" fi |