The branch, master has been updated via c91b897 s3-build: share smbtorture4 build rules with s3-waf build. from a6a722b libwbclient: CID 2199 -- NULL pointer return
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c91b897caa11c9400851e16d3091d89b79b87614 Author: Günther Deschner <g...@samba.org> Date: Tue Mar 15 11:32:03 2011 +0100 s3-build: share smbtorture4 build rules with s3-waf build. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Tue Mar 15 16:10:17 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/Makefile-smbtorture4 | 23 +++++++++++++++++++++++ source3/Makefile.in | 24 ++++-------------------- source3/wscript_build | 6 ++++++ 3 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 source3/Makefile-smbtorture4 Changeset truncated at 500 lines: diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4 new file mode 100644 index 0000000..939d4d4 --- /dev/null +++ b/source3/Makefile-smbtorture4 @@ -0,0 +1,23 @@ +WAF_BINARY=buildtools/bin/waf +WAF=$(WAF_BINARY) +WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) +SAMBA4_BINARIES="smbtorture,ndrdump" + +samba4-configure: + @(cd .. && \ + CFLAGS='' $(WAF) reconfigure || \ + CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure ) + +.PHONY: samba4-configure + +bin/smbtorture4: $(BINARY_PREREQS) samba4-configure + cd .. && $(WAF_BUILD) --targets=smbtorture + cp ../bin/smbtorture bin/smbtorture4 + +.PHONY: bin/smbtorture4 + +bin/ndrdump4: $(BINARY_PREREQS) samba4-configure + cd .. && $(WAF_BUILD) --targets=ndrdump + cp ../bin/ndrdump bin/ndrdump4 + +.PHONY: bin/ndrdump4 diff --git a/source3/Makefile.in b/source3/Makefile.in index 5b5a938..5ebf078 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3481,24 +3481,8 @@ libnetapi_examples: libnetapi clean_libnetapi_examples: $(MAKE) -C lib/netapi/examples clean -WAF_BINARY=buildtools/bin/waf -WAF=$(WAF_BINARY) -WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) -SAMBA4_BINARIES="smbtorture,ndrdump" +bin/smbtorture4: $(BINARY_PREREQS) + $(MAKE) -f Makefile-smbtorture4 bin/smbtorture4 -samba4-configure: - @(cd .. && \ - CFLAGS='' $(WAF) reconfigure || \ - CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure ) - -.PHONY: samba4-configure - -bin/smbtorture4: $(BINARY_PREREQS) samba4-configure - cd .. && $(WAF_BUILD) --targets=smbtorture - cp ../bin/smbtorture bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd .. && $(WAF_BUILD) --targets=ndrdump - cp ../bin/ndrdump bin/ndrdump4 - -.PHONY: bin/smbtorture4 +bin/ndrdump4: $(BINARY_PREREQS) + $(MAKE) -f Makefile-smbtorture4 bin/ndrdump4 diff --git a/source3/wscript_build b/source3/wscript_build index 1e0fa4a..3bbeeea 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -634,6 +634,12 @@ t = bld.SAMBA_GENERATOR('build_env.h', t.env.SRCDIR = bld.path.abspath() t.env.BUILDDIR = bld.path.abspath() +if not bld.env.toplevel_build: + bld.SAMBA_GENERATOR('smbtorture4', + source='', + target='', + rule='cd ../; make -f Makefile-smbtorture4 bin/smbtorture4', + always=True) bld.SETUP_BUILD_GROUPS() -- Samba Shared Repository