X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=lib%2Fldb%2Fwscript;h=028b1c4677ca62213ccb50cae36449ca59438eba;hb=de3bb5cd5236565f2b79644d99e55d03b254b65e;hp=6a204c0e42a29c5a24cd8c7d337e0effc79e5697;hpb=cb58e188008bf920df88dc0212b9f9bb23263179;p=samba.git diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 6a204c0e42a..028b1c4677c 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -1,19 +1,22 @@ #!/usr/bin/env python APPNAME = 'ldb' -VERSION = '1.3.2' - -blddir = 'bin' +VERSION = '1.6.1' import sys, os # find the buildtools directory -srcdir = '.' -while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: - srcdir = srcdir + '/..' -sys.path.insert(0, srcdir + '/buildtools/wafsamba') +top = '.' +while not os.path.exists(top+'/buildtools') and len(top.split('/')) < 5: + top = top + '/..' +sys.path.insert(0, top + '/buildtools/wafsamba') + +out = 'bin' -import wafsamba, samba_dist, Utils +import wafsamba +from wafsamba import samba_dist, samba_utils +from waflib import Errors, Options, Logs, Context +import shutil samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent @@ -23,13 +26,18 @@ samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc samba_dist.DIST_FILES('''lib/util/binsearch.h:lib/util/binsearch.h''') -def set_options(opt): +def options(opt): opt.BUILTIN_DEFAULT('replace') opt.PRIVATE_EXTENSION_DEFAULT('ldb', noextension='ldb') opt.RECURSE('lib/tdb') opt.RECURSE('lib/tevent') opt.RECURSE('lib/replace') - opt.tool_options('python') # options for disabling pyc or pyo compilation + opt.load('python') # options for disabling pyc or pyo compilation + + opt.add_option('--without-ldb-lmdb', + help='disable new LMDB backend for LDB', + action='store_true', dest='without_ldb_lmdb', default=False) + def configure(conf): conf.RECURSE('lib/tdb') @@ -40,19 +48,19 @@ def configure(conf): conf.RECURSE('third_party/cmocka') else: if not conf.CHECK_POPT(): - raise Utils.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') + raise Errors.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') else: conf.define('USING_SYSTEM_POPT', 1) if not conf.CHECK_CMOCKA(): - raise Utils.WafError('cmocka development package have not been found.\nIf third_party is installed, check that it is in the proper place.') + raise Errors.WafError('cmocka development package have not been found.\nIf third_party is installed, check that it is in the proper place.') else: conf.define('USING_SYSTEM_CMOCKA', 1) conf.RECURSE('lib/replace') conf.find_program('python', var='PYTHON') conf.find_program('xsltproc', var='XSLTPROC') - conf.check_tool('python') + conf.load('python') conf.check_python_version((2,4,2)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=not conf.env.disable_python) @@ -63,23 +71,34 @@ def configure(conf): conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not conf.env.standalone_ldb: + max_ldb_version = [int(x) for x in VERSION.split(".")] + max_ldb_version[2] = 999 + max_ldb_version_dots = "%d.%d.%d" % tuple(max_ldb_version) + if conf.env.disable_python: - if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent'): + if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', + minversion=VERSION, + maxversion=max_ldb_version_dots, + onlyif='talloc tdb tevent', + implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) else: using_system_pyldb_util = True - if not conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent ldb'): + dflt_name = 'pyldb-util' + conf.all_envs['default']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(dflt_name, + minversion=VERSION, + maxversion=max_ldb_version_dots, + onlyif='talloc tdb tevent', + implied_deps='replace talloc tdb tevent ldb'): using_system_pyldb_util = False # We need to get a pyldb-util for all the python versions # we are building for if conf.env['EXTRA_PYTHON']: name = 'pyldb-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] - if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, + if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, + minversion=VERSION, + maxversion=max_ldb_version_dots, onlyif='talloc tdb tevent', implied_deps='replace talloc tdb tevent ldb'): using_system_pyldb_util = False @@ -87,11 +106,48 @@ def configure(conf): if using_system_pyldb_util: conf.define('USING_SYSTEM_PYLDB_UTIL', 1) - if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION, - onlyif='talloc tdb tevent pyldb-util', - implied_deps='replace talloc tdb tevent'): + if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', + minversion=VERSION, + maxversion=max_ldb_version_dots, + onlyif='talloc tdb tevent %s' % dflt_name, + implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) + if not conf.CHECK_CODE('return !(sizeof(size_t) >= 8)', + "HAVE_64_BIT_SIZE_T_FOR_LMDB", + execute=True, + msg='Checking for a 64-bit host to ' + 'support lmdb'): + Logs.warn("--without-ldb-lmdb implied as this " + "host is not 64-bit") + + if not conf.env.standalone_ldb and \ + not Options.options.without_ad_dc and \ + conf.CONFIG_GET('ENABLE_SELFTEST'): + Logs.warn("NOTE: Some AD DC parts of selftest will fail") + + conf.env.REQUIRE_LMDB = False + else: + if conf.env.standalone_ldb: + if Options.options.without_ldb_lmdb: + conf.env.REQUIRE_LMDB = False + else: + conf.env.REQUIRE_LMDB = True + elif Options.options.without_ad_dc: + conf.env.REQUIRE_LMDB = False + else: + if Options.options.without_ldb_lmdb: + if not Options.options.without_ad_dc and \ + conf.CONFIG_GET('ENABLE_SELFTEST'): + raise Errors.WafError('--without-ldb-lmdb conflicts ' + 'with --enable-selftest while ' + 'building the AD DC') + + conf.env.REQUIRE_LMDB = False + else: + conf.env.REQUIRE_LMDB = True + + if conf.CONFIG_SET('USING_SYSTEM_LDB'): v = VERSION.split('.') conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_MAJOR', int(v[0])) @@ -110,6 +166,39 @@ def configure(conf): if not sys.platform.startswith("openbsd"): conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + # if lmdb support is enabled then we require lmdb + # is present, build the mdb back end and enable lmdb support in + # the tools. + if conf.env.REQUIRE_LMDB and \ + not conf.CONFIG_SET('USING_SYSTEM_LDB'): + if not conf.CHECK_CFG(package='lmdb', + args='"lmdb >= 0.9.16" --cflags --libs', + msg='Checking for lmdb >= 0.9.16', + mandatory=False): + if not conf.CHECK_CODE(''' + #if MDB_VERSION_MAJOR == 0 \ + && MDB_VERSION_MINOR <= 9 \ + && MDB_VERSION_PATCH < 16 + #error LMDB too old + #endif + ''', + 'HAVE_GOOD_LMDB_VERSION', + headers='lmdb.h', + msg='Checking for lmdb >= 0.9.16 via header check'): + + if conf.env.standalone_ldb: + raise Errors.WafError('ldb build (unless --without-ldb-lmdb) ' + 'requires ' + 'lmdb 0.9.16 or later') + elif not Options.options.without_ad_dc: + raise Errors.WafError('Samba AD DC and --enable-selftest ' + 'requires ' + 'lmdb 0.9.16 or later') + + if conf.CHECK_FUNCS_IN('mdb_env_create', 'lmdb', headers='lmdb.h'): + conf.DEFINE('HAVE_LMDB', '1') + + conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) conf.SAMBA_CONFIG_H() @@ -127,9 +216,15 @@ def build(bld): bld.RECURSE('lib/tdb') if bld.env.standalone_ldb: + if not 'PACKAGE_VERSION' in bld.env: + bld.env.PACKAGE_VERSION = VERSION + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' private_library = False else: private_library = True + # we're not currently linking against the ldap libs, but ldb.pc.in + # has @LDAP_LIBS@ + bld.env.LDAP_LIBS = '' LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') @@ -150,17 +245,10 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): for env in bld.gen_python_environments(['PKGCONFIGDIR']): - # we're not currently linking against the ldap libs, but ldb.pc.in - # has @LDAP_LIBS@ - bld.env.LDAP_LIBS = '' - - if not 'PACKAGE_VERSION' in bld.env: - bld.env.PACKAGE_VERSION = VERSION - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' name = bld.pyembed_libname('pyldb-util') bld.SAMBA_LIBRARY(name, - deps='ldb', + deps='replace ldb', source='pyldb_util.c', public_headers=('' if private_library else 'pyldb.h'), public_headers_install=not private_library, @@ -174,7 +262,7 @@ def build(bld): if not bld.CONFIG_SET('USING_SYSTEM_LDB'): bld.SAMBA_PYTHON('pyldb', 'pyldb.c', - deps='ldb ' + name, + deps='replace ldb ' + name, realname='ldb.so', cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) @@ -239,15 +327,6 @@ def build(bld): public_headers_install=not private_library) t.env.LDB_VERSION = VERSION - - bld.SAMBA_MODULE('ldb_paged_results', - 'modules/paged_results.c', - init_function='ldb_paged_results_init', - module_init_name='ldb_init_module', - internal_module=False, - deps='ldb', - subsystem='ldb') - bld.SAMBA_MODULE('ldb_asq', 'modules/asq.c', init_function='ldb_asq_init', @@ -307,12 +386,59 @@ def build(bld): bld.SAMBA_MODULE('ldb_tdb', bld.SUBDIR('ldb_tdb', - '''ldb_tdb.c ldb_search.c ldb_index.c - ldb_cache.c ldb_tdb_wrap.c'''), + '''ldb_tdb_init.c'''), init_function='ldb_tdb_init', module_init_name='ldb_init_module', internal_module=False, - deps='tdb ldb', + deps='ldb ldb_tdb_int ldb_key_value', + subsystem='ldb') + + bld.SAMBA_LIBRARY('ldb_tdb_int', + bld.SUBDIR('ldb_tdb', + '''ldb_tdb_wrap.c ldb_tdb.c'''), + private_library=True, + deps='ldb tdb ldb_key_value ldb_tdb_err_map') + + bld.SAMBA_LIBRARY('ldb_tdb_err_map', + bld.SUBDIR('ldb_tdb', + '''ldb_tdb_err_map.c '''), + private_library=True, + deps='ldb tdb') + + bld.SAMBA_LIBRARY('ldb_key_value', + bld.SUBDIR('ldb_key_value', + '''ldb_kv.c ldb_kv_search.c ldb_kv_index.c + ldb_kv_cache.c'''), + private_library=True, + deps='tdb ldb ldb_tdb_err_map') + + if bld.CONFIG_SET('HAVE_LMDB'): + bld.SAMBA_MODULE('ldb_mdb', + bld.SUBDIR('ldb_mdb', + '''ldb_mdb_init.c'''), + init_function='ldb_mdb_init', + module_init_name='ldb_init_module', + internal_module=False, + deps='ldb ldb_key_value ldb_mdb_int', + subsystem='ldb') + + bld.SAMBA_LIBRARY('ldb_mdb_int', + bld.SUBDIR('ldb_mdb', + '''ldb_mdb.c '''), + private_library=True, + deps='ldb lmdb ldb_key_value') + lmdb_deps = ' ldb_mdb_int' + else: + lmdb_deps = '' + + + bld.SAMBA_MODULE('ldb_ldb', + bld.SUBDIR('ldb_ldb', + '''ldb_ldb.c'''), + init_function='ldb_ldb_init', + module_init_name='ldb_init_module', + internal_module=False, + deps='ldb ldb_tdb_int ldb_key_value' + lmdb_deps, subsystem='ldb') # have a separate subsystem for common/ldb.c, so it can rebuild @@ -332,8 +458,14 @@ def build(bld): bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='ldb-cmdline ldb', install=False) + if bld.CONFIG_SET('HAVE_LMDB'): + lmdb_deps = ' lmdb' + else: + lmdb_deps = '' # ldbdump doesn't get installed - bld.SAMBA_BINARY('ldbdump', 'tools/ldbdump.c', deps='ldb-cmdline ldb', + bld.SAMBA_BINARY('ldbdump', + 'tools/ldbdump.c', + deps='ldb-cmdline ldb' + lmdb_deps, install=False) bld.SAMBA_LIBRARY('ldb-cmdline', @@ -347,26 +479,85 @@ def build(bld): deps='cmocka ldb', install=False) + bld.SAMBA_BINARY('ldb_tdb_guid_mod_op_test', + source='tests/ldb_mod_op_test.c', + cflags='-DTEST_BE=\"tdb\" -DGUID_IDX=1', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('ldb_tdb_kv_ops_test', + source='tests/ldb_kv_ops_test.c', + cflags='-DTEST_BE=\"tdb\"', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('ldb_tdb_test', + source='tests/ldb_tdb_test.c', + deps='cmocka ldb', + install=False) + bld.SAMBA_BINARY('ldb_msg_test', source='tests/ldb_msg.c', deps='cmocka ldb', install=False) + bld.SAMBA_BINARY('test_ldb_qsort', + source='tests/test_ldb_qsort.c', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('test_ldb_dn', + source='tests/test_ldb_dn.c', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('ldb_match_test', + source='tests/ldb_match_test.c', + deps='cmocka ldb', + install=False) + + if bld.CONFIG_SET('HAVE_LMDB'): + bld.SAMBA_BINARY('ldb_mdb_mod_op_test', + source='tests/ldb_mod_op_test.c', + cflags='-DTEST_BE=\"mdb\" -DGUID_IDX=1 ' + + '-DTEST_LMDB=1', + deps='cmocka ldb lmdb', + install=False) + + bld.SAMBA_BINARY('ldb_lmdb_test', + source='tests/ldb_lmdb_test.c', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('ldb_lmdb_size_test', + source='tests/ldb_lmdb_size_test.c', + deps='cmocka ldb', + install=False) + + bld.SAMBA_BINARY('ldb_mdb_kv_ops_test', + source='tests/ldb_kv_ops_test.c', + cflags='-DTEST_BE=\"mdb\"', + deps='cmocka ldb', + install=False) + def test(ctx): '''run ldb testsuite''' - import Utils, samba_utils, shutil env = samba_utils.LOAD_ENVIRONMENT() ctx.env = env - test_prefix = "%s/st" % (Utils.g_module.blddir) + if not env.HAVE_LMDB: + raise Errors.WafError('make test called, but ldb was built ' + '--without-ldb-lmdb') + + test_prefix = "%s/st" % (Context.g_module.out) shutil.rmtree(test_prefix, ignore_errors=True) os.makedirs(test_prefix) os.environ['TEST_DATA_PREFIX'] = test_prefix - os.environ['LDB_MODULES_PATH'] = Utils.g_module.blddir + "/modules/ldb" + os.environ['LDB_MODULES_PATH'] = Context.g_module.out + "/modules/ldb" samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') - cmd = 'tests/test-tdb.sh %s' % Utils.g_module.blddir + cmd = 'tests/test-tdb.sh %s' % Context.g_module.out ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) @@ -374,14 +565,29 @@ def test(ctx): if not os.path.exists(tmp_dir): os.mkdir(tmp_dir) pyret = samba_utils.RUN_PYTHON_TESTS( - ['tests/python/api.py'], + ['tests/python/api.py', 'tests/python/index.py'], extra_env={'SELFTEST_PREFIX': test_prefix}) print("Python testsuite returned %d" % pyret) cmocka_ret = 0 - for test_exe in ['ldb_tdb_mod_op_test', - 'ldb_msg_test']: - cmd = os.path.join(Utils.g_module.blddir, test_exe) + test_exes = ['test_ldb_qsort', + 'test_ldb_dn', + 'ldb_msg_test', + 'ldb_tdb_mod_op_test', + 'ldb_tdb_guid_mod_op_test', + 'ldb_msg_test', + 'ldb_tdb_kv_ops_test', + 'ldb_tdb_test', + 'ldb_mdb_mod_op_test', + 'ldb_lmdb_test', + # we don't want to run ldb_lmdb_size_test (which proves we can + # fit > 4G of data into the DB), it would fill up the disk on + # many of our test instances + 'ldb_mdb_kv_ops_test', + 'ldb_match_test'] + + for test_exe in test_exes: + cmd = os.path.join(Context.g_module.out, test_exe) cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd) sys.exit(ret or pyret or cmocka_ret)