Rev 5367: Try bzr and, if this is a brz checkout, use bzr branch nick and in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

[Michael Adam]

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5367
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam <[EMAIL PROTECTED]>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 13:17:37 +0200
message:
  Try bzr and, if this is a brz checkout, use bzr branch nick and
  revision number for the version string if svn info and svk info fail.
modified:
  source/script/mkversion.sh     mkversion.sh-20060530022627-7fabc53ed219204b
=== modified file 'source/script/mkversion.sh'
--- a/source/script/mkversion.sh        2006-05-30 08:59:01 +0000
+++ b/source/script/mkversion.sh        2007-04-18 11:17:37 +0000
@@ -82,6 +82,13 @@
        else
            TMP_SVK_REVISION_STR="[EMAIL PROTECTED]"
        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 @@
            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