X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=lib%2Fldb%2Fwscript;h=6e224e7b4b78c48ad0caf43e776eafaef8bc4061;hb=545c3e6b12430f19ecd64d628e4f19e1556aa450;hp=0fba22555d348b15a4de571b3f069d249bc563ff;hpb=13a1406fa11f4c7eb1996a5ac1e33c966b886082;p=samba.git diff --git a/lib/ldb/wscript b/lib/ldb/wscript old mode 100755 new mode 100644 index 0fba22555d3..6e224e7b4b7 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -1,33 +1,43 @@ #!/usr/bin/env python APPNAME = 'ldb' -VERSION = '1.1.18' - -blddir = 'bin' +VERSION = '1.6.0' 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, Options, 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 - third_party/popt:third_party/popt - buildtools:buildtools''') + third_party/popt:third_party/popt + third_party/cmocka:third_party/cmocka + buildtools:buildtools third_party/waf:third_party/waf''') +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') @@ -35,18 +45,24 @@ def configure(conf): if conf.CHECK_FOR_THIRD_PARTY(): conf.RECURSE('third_party/popt') + 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 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=True) + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=not conf.env.disable_python) # where does the default LIBDIR end up? in conf.env somewhere? # @@ -55,14 +71,88 @@ def configure(conf): conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not conf.env.standalone_ldb: - if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent'): - conf.define('USING_SYSTEM_LDB', 1) - if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION, - onlyif='talloc tdb tevent ldb', - implied_deps='replace talloc tdb tevent ldb'): - conf.define('USING_SYSTEM_PYLDB_UTIL', 1) + 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, + 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 + 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, + maxversion=max_ldb_version_dots, + onlyif='talloc tdb tevent', + implied_deps='replace talloc tdb tevent ldb'): + using_system_pyldb_util = False + + if using_system_pyldb_util: + conf.define('USING_SYSTEM_PYLDB_UTIL', 1) + + 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])) + conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_MINOR', int(v[1])) + conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -76,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() @@ -87,14 +210,21 @@ def build(bld): if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party/popt') + bld.RECURSE('third_party/cmocka') bld.RECURSE('lib/replace') 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') @@ -112,29 +242,42 @@ def build(bld): internal_module=False, subsystem='ldb') - # 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' - - if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): - bld.SAMBA_LIBRARY('pyldb-util', - deps='ldb', - source='pyldb_util.c', - public_headers='pyldb.h', - public_headers_install=not private_library, - vnum=VERSION, - private_library=private_library, - pc_files='pyldb-util.pc', - pyembed=True, - abi_directory='ABI', - abi_match='pyldb_*') + if bld.PYTHON_BUILD_IS_ENABLED(): + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): + + name = bld.pyembed_libname('pyldb-util') + bld.SAMBA_LIBRARY(name, + deps='replace ldb', + source='pyldb_util.c', + public_headers=('' if private_library else 'pyldb.h'), + public_headers_install=not private_library, + vnum=VERSION, + private_library=private_library, + pc_files='pyldb-util.pc', + pyembed=True, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + abi_directory='ABI', + abi_match='pyldb_*') + + if not bld.CONFIG_SET('USING_SYSTEM_LDB'): + bld.SAMBA_PYTHON('pyldb', 'pyldb.c', + deps='replace ldb ' + name, + realname='ldb.so', + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) + + # Do only install this file as part of the Samba build if we do not + # use the system libldb! + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): + bld.SAMBA_SCRIPT('_ldb_text.py', + pattern='_ldb_text.py', + installdir='python') + + bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') if not bld.CONFIG_SET('USING_SYSTEM_LDB'): - if Options.is_install: + if bld.is_install: modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}') else: # when we run from the source directory, we want to use @@ -143,12 +286,14 @@ def build(bld): abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*' + ldb_headers = ('include/ldb.h include/ldb_errors.h ' + 'include/ldb_module.h include/ldb_handlers.h') + bld.SAMBA_LIBRARY('ldb', COMMON_SRC + ' ' + LDB_MAP_SRC, deps='tevent LIBLDB_MAIN replace', includes='include', - public_headers='include/ldb.h include/ldb_errors.h '\ - 'include/ldb_module.h include/ldb_handlers.h', + public_headers=('' if private_library else ldb_headers), public_headers_install=not private_library, pc_files='ldb.pc', vnum=VERSION, @@ -158,28 +303,30 @@ def build(bld): abi_match = abi_match) # generate a include/ldb_version.h + def generate_ldb_version_h(t): + '''generate a vscript file for our public libraries''' + + tgt = t.outputs[0].bldpath(t.env) + + v = t.env.LDB_VERSION.split('.') + + f = open(tgt, mode='w') + try: + f.write('#define LDB_VERSION "%s"\n' % t.env.LDB_VERSION) + f.write('#define LDB_VERSION_MAJOR %d\n' % int(v[0])) + f.write('#define LDB_VERSION_MINOR %d\n' % int(v[1])) + f.write('#define LDB_VERSION_RELEASE %d\n' % int(v[2])) + finally: + f.close() + return t = bld.SAMBA_GENERATOR('ldb_version.h', - rule='echo "#define LDB_VERSION \\"${LDB_VERSION}\\"" > ${TGT}', + rule=generate_ldb_version_h, dep_vars=['LDB_VERSION'], target='include/ldb_version.h', public_headers='include/ldb_version.h', public_headers_install=not private_library) t.env.LDB_VERSION = VERSION - - bld.SAMBA_PYTHON('pyldb', 'pyldb.c', - deps='ldb pyldb-util', - realname='ldb.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % 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', @@ -216,7 +363,6 @@ def build(bld): 'tests/sample_module.c', init_function='ldb_sample_init', internal_module=False, - allow_warnings=True, module_init_name='ldb_init_module', deps='ldb', subsystem='ldb') @@ -240,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 @@ -265,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', @@ -274,19 +473,118 @@ def build(bld): deps='ldb dl popt', private_library=True) + bld.SAMBA_BINARY('ldb_tdb_mod_op_test', + source='tests/ldb_mod_op_test.c', + cflags='-DTEST_BE=\"tdb\"', + 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) + + 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 - test_prefix = "%s/st" % (Utils.g_module.blddir) + env = samba_utils.LOAD_ENVIRONMENT() + ctx.env = env + + 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 - cmd = 'tests/test-tdb.sh %s' % Utils.g_module.blddir + 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' % Context.g_module.out ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) - # FIXME: Run python testsuite - sys.exit(ret) + + tmp_dir = os.path.join(test_prefix, 'tmp') + if not os.path.exists(tmp_dir): + os.mkdir(tmp_dir) + pyret = samba_utils.RUN_PYTHON_TESTS( + ['tests/python/api.py', 'tests/python/index.py'], + extra_env={'SELFTEST_PREFIX': test_prefix}) + print("Python testsuite returned %d" % pyret) + + cmocka_ret = 0 + 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'] + + 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) def dist(): '''makes a tarball for distribution'''