summaryrefslogtreecommitdiff
path: root/source3/script
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-04-20 10:27:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:32 -0500
commit90ad4eae89e57cdb74b89bc8be23d071b8b6335e (patch)
tree8e78961a69c48b857efe77bd7b307415ab3dd25e /source3/script
parent80576572cc733336d61f33a2d640151393ec977b (diff)
downloadsamba-90ad4eae89e57cdb74b89bc8be23d071b8b6335e.tar.gz
samba-90ad4eae89e57cdb74b89bc8be23d071b8b6335e.tar.bz2
samba-90ad4eae89e57cdb74b89bc8be23d071b8b6335e.zip
r22401: Add bzr revision+nick support to mkversion.sh.
The plan is to actually synchronize with SAMBA_4_0's mkversion.sh, which is more elaborate. But there are a few differences in behaviour I still have to check. So I am cheching this here in for a start... Michael (This used to be commit dec7e31f298c565b49b7bd650e164274d0f61778)
Diffstat (limited to 'source3/script')
-rwxr-xr-xsource3/script/mkversion.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index 5784054921..64f1a778ae 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -82,6 +82,13 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
else
TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
fi
+ if test x"${HAVESVK}" = x"no";then
+ HAVEBZR=no
+ bzr revno > /dev/null 2>&1 && HAVEBZR=yes
+ TMP_BZR_REVNO=`bzr revno 2> /dev/null`
+ TMP_BZR_NICK=`bzr nick 2> /dev/null`
+ TMP_BZR_REVISION_STR="${TMP_BZR_NICK}-${TMP_BZR_REVNO}"
+ fi
fi
if test x"${HAVESVN}" = x"yes";then
@@ -89,6 +96,8 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}" >> $OUTPUT_FILE
elif test x"${HAVESVK}" = x"yes";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}"
+ elif test x"${HAVEBZR}" = x"yes";then
+ SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-BZR-build-${TMP_BZR_REVISION_STR}"
else
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-UNKNOWN"
fi