selftest: Move Samba4 selftest wscript to the top level

[kai/samba.git] / wscript

diff --git a/wscript b/wscript
old mode 100644 (file)
new mode 100755 (executable)
index 56b75d9..6961eb8
--- a/wscript
+++ b/wscript
@@ -21,21 +21,20 @@ samba_dist.DIST_DIRS('.')
 #samba-4.0.0 branded tarball (until the merge is complete) and the
 #core elements of the autotools build system (which is known to
 #produce buggy binaries).
-samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap source3/ ' +
+samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap ' +
                           'packaging/ docs-xml/ examples/ swat/ WHATSNEW.txt MAINTAINERS ')
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'
 
+os.environ['TOPLEVEL_BUILD'] = '1'
 
 def set_options(opt):
-    os.putenv('TOPLEVEL_BUILD', '1')
-
     opt.BUILTIN_DEFAULT('NONE')
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
     opt.RECURSE('source4/dynconfig')
     opt.RECURSE('source4/lib/ldb')
-    opt.RECURSE('source4/selftest')
+    opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('lib/nss_wrapper')
     opt.RECURSE('lib/socket_wrapper')
@@ -48,6 +47,10 @@ def set_options(opt):
                    help='enable special build farm options',
                    action='store_true', dest='BUILD_FARM')
 
+    gr.add_option('--enable-s3build',
+                   help='enable build of s3 binaries',
+                   action='store_true', dest='S3BUILD')
+
     opt.tool_options('python') # options for disabling pyc or pyo compilation
     # enable options related to building python extensions
 
@@ -63,10 +66,13 @@ def configure(conf):
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
 
+    if Options.options.S3BUILD:
+        conf.env.enable_s3build = True
+
     # this enables smbtorture.static for s3 in the build farm
     conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
 
-    conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #include')
+    conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include')
 
     conf.RECURSE('lib/replace')
 
@@ -106,8 +112,9 @@ def configure(conf):
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('pidl')
-    conf.RECURSE('source4/selftest')
-    conf.RECURSE('source3')
+    conf.RECURSE('selftest')
+    if conf.env.enable_s3build:
+        conf.RECURSE('source3')
 
     # we don't want any libraries or modules to rely on runtime
     # resolution of symbols