svn commit: samba r22401 - in branches/SAMBA_3_0/source/script: .

[obnox at samba.org]

Author: obnox
Date: 2007-04-20 10:27:33 +0000 (Fri, 20 Apr 2007)
New Revision: 22401

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22401

Log:

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


Modified:
   branches/SAMBA_3_0/source/script/mkversion.sh


Changeset:
Modified: branches/SAMBA_3_0/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0/source/script/mkversion.sh	2007-04-20 07:36:21 UTC (rev 22400)
+++ branches/SAMBA_3_0/source/script/mkversion.sh	2007-04-20 10:27:33 UTC (rev 22401)
@@ -82,6 +82,13 @@
 	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 @@
 	    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