toplevel build in master

Stefan (metze) Metzmacher metze at
Sat Feb 5 01:11:51 MST 2011

Hi Tridge,

>  > I think that a good plan, but I'd like to make sure that the following
>  > is still possible:
>  > 
>  > - That the source3 build can build smbtorture4, without building parts
>  > of source3 with waf.
> my patches don't affect the existing builds - so the existing s3 waf
> and autoconf builds are unchanged, as is the s4 waf build in source4.
> The s4 source4/ build will be removed once it is no longer needed, and
> I'll make sure that the s3 smbtorture4 build still works when I do that.
> I'm hoping to then be able to start on the build of bin/smbd and
> bin/nmbd in the top level without impacting existing development in
> source3, until such time as its ready and we have a discussion on a
> time to move across to using the top level build for all development
> in master.
>  > - That the source3 autoconf build uses waf directly with out the
>  > configure/make wrappers
>  >   to build smbtorture.
> oh? Currently it calls ./configure.developer and make in source4. When
> we remove the source4/ waf build, that would change to making the same
> calls in the top level.
> Why don't you want to use the wrappers for this?

Because I want the wrappers to be removed in the v3-6-test branch,
so we only have the toplevel waf files remaining there...

>  > So that we can still do easy cherry picks to v3-6-test, but just
>  > remove the top level configure and Makefile after v3-6-test is
>  > closed for developer commits and still be able to build
>  > smbtorture4.
> ok, I think I see what you mean. I think you may be assuming that
> source4/wscript and source4/wscript_build will remain unchanged. I was
> planning to remove those once we get rid of the source4/ waf
> build. Keeping them will just be confusing as we move to a top level
> build.

Exactly and the source3 autoconf build should use the toplevel waf files
directly, which shouldn't be a problem at all.

> The 3.6 branch is going to need to be able to cope with changes like
> this in master. Getting 4.0 out is going to require quite a few code
> changes in lots of places - the patches I'm proposing now will be
> pretty small compared to everything else that is bound to come up.

I know, but as you propose the small changes now where v3-6-test isn't
completely independed from master yet, I want to keep it as close to master
as possible. My point is just that having top level 'configure' and
in v3-6 will confuse people in the same way as keeping source4/wscript and
source4/wscript_build arround.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <>

More information about the samba-technical mailing list