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]

On Wed, Apr 18, 2007 at 03:57:05PM +0200, Stefan (metze) Metzmacher wrote:
> Michael Adam schrieb:
> > Hi Metze,
> > 
> > On Wed, Apr 18, 2007 at 02:37:14PM +0200, Stefan (metze) Metzmacher wrote:
> >> Michael Adam schrieb:
> >>> It puts BZR-$(bzr nick)-$(bzr revno) instead of SVN-${SVN_REVISION}
> >>> in the SAMBA_VERSION_STRING if the current directory
> >>>   1. is neither an svn nor an svk checkout and
> >>>   2. is a bzr checkout.
> >> have you seen what we have in samba4 ?
> > 
> > To be honest - not yet. :-/
> > 
> >> we should try to sync samba 3 and 4 here.
> 
> think what needs to be added to samba4 is the letter release support.

Does that refer e.g. to the a in 3.0.14a ?
Isn't that already there in both versions?!
Or else I misunderstood something here.

The diff at the corresponding part ist as follows:

--- SAMBA_3_0/source/script/mkversion.sh  2007-04-18 15:56:37.000000000 +0200
+++ SAMBA_4_0/source/script/mkversion.sh    2006-11-09 15:40:52.000000000 +0100
@@ -37,12 +44,15 @@
 
 
 ##
-## maybe add "3.0.22a" or "3.0.22pre1" or "3.0.22rc1"
+## maybe add "3.0.22a" or "4.0.0tp11" or "3.0.22pre1" or "3.0.22rc1"
 ## We do not do pre or rc version on patch/letter releases
 ##
 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
     ## maybe add "3.0.22pre2"
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"

> then we can copy the samba4 file to samba3.

To me, it looks like it could be copied as is?!

> the good thing in samba4 is that we cache the output in a shell var
> and use echo -e "$CACHE" that's much faster. 

Hey, you made me searching for $CACHE a bit until I got what you meant...
Thanks. ;)

Michael