diff options
| -rw-r--r-- | testsuite/headers/wscript_build | 5 | ||||
| -rwxr-xr-x | wscript | 6 | ||||
| -rwxr-xr-x | wscript_build | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build index f83538ef09..635c8641fc 100644 --- a/testsuite/headers/wscript_build +++ b/testsuite/headers/wscript_build @@ -8,6 +8,11 @@ def build_test_headers(task): f.write('/* generated header test */\n') hlist = task.env.public_headers_list[:] hlist.sort() + # We need to include tdb.h before ntdb.h. It's the rules! + if 'tdb.h' in hlist and 'ntdb.h' in hlist: + hlist.remove('ntdb.h') + hlist.append('ntdb.h') + for h in hlist: f.write('#include "%s"\n' % os.path.normpath(h)) f.close() @@ -37,6 +37,7 @@ def set_options(opt): opt.RECURSE('lib/replace') opt.RECURSE('dynconfig') opt.RECURSE('lib/ldb') + opt.RECURSE('lib/ntdb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') opt.RECURSE('lib/nss_wrapper') @@ -123,6 +124,7 @@ def configure(conf): conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') conf.RECURSE('lib/ccan') + conf.RECURSE('lib/ntdb') conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') @@ -195,14 +197,14 @@ def pydoctor(ctx): '''build python apidocs''' bp = os.path.abspath('bin/python') mpaths = {} - for m in ['talloc', 'tdb', 'ldb']: + for m in ['talloc', 'tdb', 'ldb', 'ntdb']: f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r') try: mpaths[m] = f.read().strip() finally: f.close() cmd='PYTHONPATH=%s pydoctor --introspect-c-modules --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba --add-module %s --add-module %s --add-module %s' % ( - bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc']) + bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc'], mpaths['ntdb']) print("Running: %s" % cmd) os.system(cmd) diff --git a/wscript_build b/wscript_build index d4959f32f8..dc06b647b8 100755 --- a/wscript_build +++ b/wscript_build @@ -34,6 +34,7 @@ bld.RECURSE('lib/tevent') bld.RECURSE('lib/addns') bld.RECURSE('lib/ccan') bld.RECURSE('lib/tdb_compat') +bld.RECURSE('lib/ntdb') bld.RECURSE('lib/ldb') bld.RECURSE('lib/param') bld.RECURSE('dynconfig') |