wafsamba: pass environment to cross-execute tests

[metze/samba/wip.git] / wscript_build

diff --git a/wscript_build b/wscript_build
index 54548769b1910103610ee38fc802d4e10c92b878..f9e033c0dab8cbc8e7356e3f93f47fc3ebbd34d8 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -2,7 +2,7 @@
 
 # top level waf build script for samba4
 
-import Options
+from waflib import Options
 import os
 srcdir = "."
 
@@ -29,7 +29,7 @@ bld.SAMBA_MKVERSION('version.h')
 # bld.ENABLE_MAGIC_ORDERING()
 
 bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
-bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
+bld.env.ABS_TOP_BUILDDIR = bld.bldnode.abspath() + '/docs-xml'
 bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
                    ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
                    ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
@@ -46,6 +46,7 @@ bld.RECURSE('lib/texpect')
 bld.RECURSE('lib/addns')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
+bld.RECURSE('lib/printer_driver')
 bld.RECURSE('lib/audit_logging')
 bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
@@ -70,7 +71,6 @@ bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
 bld.RECURSE('source4/lib/events')
 bld.RECURSE('source4/lib/cmdline')
-bld.RECURSE('source4/lib/http')
 if bld.CHECK_FOR_THIRD_PARTY():
     bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')
@@ -88,13 +88,12 @@ bld.RECURSE('source4/echo_server')
 bld.RECURSE('source4/smb_server')
 bld.RECURSE('source4/rpc_server')
 bld.RECURSE('source4/ldap_server')
-bld.RECURSE('source4/web_server')
 bld.RECURSE('source4/winbind')
 bld.RECURSE('source4/nbt_server')
 bld.RECURSE('source4/wrepl_server')
 bld.RECURSE('source4/cldap_server')
 bld.RECURSE('source4/ntp_signd')
-bld.RECURSE('source4/utils')
+bld.RECURSE('source4/utils/oLschema2ldif')
 bld.RECURSE('source4/ntvfs')
 bld.RECURSE('source4/torture')
 bld.RECURSE('librpc')
@@ -117,6 +116,8 @@ bld.RECURSE('libcli/echo')
 bld.RECURSE('libcli/dns')
 bld.RECURSE('libcli/samsync')
 bld.RECURSE('libcli/registry')
+bld.RECURSE('libcli/http')
+bld.RECURSE('lib/mscat')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')
 if bld.CONFIG_GET('ENABLE_SELFTEST'):
@@ -149,6 +150,7 @@ bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
 bld.RECURSE('lib/krb5_wrap')
 bld.RECURSE('packaging')
+bld.RECURSE('lib/fuzzing')
 
 bld.RECURSE('testsuite/headers')