#!/usr/bin/env python
APPNAME = 'ldb'
-VERSION = '0.9.12'
+VERSION = '0.9.20'
blddir = 'bin'
srcdir = '../' + srcdir
sys.path.insert(0, srcdir + '/buildtools/wafsamba')
-import wafsamba, samba_dist
+import wafsamba, samba_dist, Options
samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tevent:lib/tevent lib/popt:lib/popt
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
- opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextenion='ldb')
+ opt.PRIVATE_EXTENSION_DEFAULT('ldb', noextension='ldb')
opt.RECURSE('lib/tdb')
opt.RECURSE('lib/tevent')
+ opt.RECURSE('lib/replace')
def configure(conf):
conf.RECURSE('lib/tdb')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/popt')
+ conf.RECURSE('lib/replace')
# where does the default LIBDIR end up? in conf.env somewhere?
#
conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
- s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4
-
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_ldb:
onlyif='talloc tdb tevent',
implied_deps='replace talloc tdb tevent'):
conf.define('USING_SYSTEM_LDB', 1)
+ if conf.CHECK_BUNDLED_SYSTEM('pyldb-util', minversion=VERSION,
+ onlyif='talloc tdb tevent ldb',
+ implied_deps='replace talloc tdb tevent ldb'):
+ conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
if conf.env.standalone_ldb:
- conf.find_program('xsltproc', var='XSLTPROC')
+ conf.CHECK_XSLTPROC_MANPAGES()
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
conf.env.ENABLE_LDAP_BACKEND = True
+ conf.DEFINE('LDB_VERSION', VERSION, quote=True)
+
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+ conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+
conf.SAMBA_CONFIG_H()
def build(bld):
bld.RECURSE('lib/tdb')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/popt')
+ bld.RECURSE('lib/replace')
- # in Samba4 we build some extra modules, and add extra
- # capabilities to the ldb cmdline tools
- s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4
+ if bld.env.standalone_ldb:
+ private_library = False
+ else:
+ private_library = True
LDB_MAP_SRC = bld.SUBDIR('ldb_map',
'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
COMMON_SRC = bld.SUBDIR('common',
- '''ldb.c ldb_ldif.c ldb_parse.c ldb_msg.c ldb_utf8.c
- ldb_debug.c ldb_dn.c ldb_match.c ldb_modules.c
+ '''ldb_modules.c ldb_ldif.c ldb_parse.c ldb_msg.c ldb_utf8.c
+ ldb_debug.c ldb_dn.c ldb_match.c ldb_options.c
ldb_attributes.c attrib_handlers.c ldb_controls.c qsort.c''')
- if s4_build:
- # this is only in the s4 build
- bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c',
- init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)',
- deps='talloc LIBCLI_LDAP CREDENTIALS',
- internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
- subsystem='ldb')
- else:
- # this is not included in the s4 build
- bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c',
- init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)',
- deps='talloc lber ldap',
- enabled=bld.env.ENABLE_LDAP_BACKEND,
- subsystem='ldb')
+ bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c',
+ init_function='ldb_ldap_init',
+ module_init_name='ldb_init_module',
+ deps='talloc lber ldap ldb',
+ enabled=bld.env.ENABLE_LDAP_BACKEND,
+ internal_module=False,
+ subsystem='ldb')
# we're not currently linking against the ldap libs, but ldb.pc.in
# has @LDAP_LIBS@
bld.env.PACKAGE_VERSION = VERSION
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
- abi_file = 'ABI/ldb-%s.sigs' % VERSION
-
- bld.SAMBA_PYTHON('pyldb_util', deps='ldb',
- source='pyldb_util.c')
+ if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
+ bld.SAMBA_LIBRARY('pyldb-util',
+ deps='ldb',
+ source='pyldb_util.c',
+ public_headers='pyldb.h',
+ vnum=VERSION,
+ private_library=private_library,
+ pc_files='pyldb-util.pc',
+ pyext=True)
if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
- modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}')
+ if Options.is_install:
+ modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}')
+ else:
+ # when we run from the source directory, we want to use
+ # the current modules, not the installed ones
+ modules_dir = os.path.join(os.getcwd(), 'bin/modules/ldb')
+
+ abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*'
+
bld.SAMBA_LIBRARY('ldb',
COMMON_SRC + ' ' + LDB_MAP_SRC,
- deps='tevent ldb',
+ deps='tevent LIBLDB_MAIN',
includes='include',
public_headers='include/ldb.h include/ldb_errors.h '\
- 'include/ldb_module.h include/ldb_handlers.h',
+ 'include/ldb_module.h include/ldb_handlers.h',
pc_files='ldb.pc',
- cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir,
- abi_file=abi_file,
- abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*',
- vnum=VERSION, manpages='man/ldb.3',
- is_bundled=not bld.env.standalone_ldb)
+ vnum=VERSION,
+ private_library=private_library,
+ manpages='man/ldb.3',
+ abi_directory = 'ABI',
+ abi_match = abi_match)
+
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
- deps='ldb pyldb_util',
- realname='ldb.so')
+ 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_MODULE(paged_results)',
+ init_function='ldb_paged_results_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_asq',
'modules/asq.c',
- init_function='LDB_MODULE(asq)',
+ init_function='ldb_asq_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_server_sort',
'modules/sort.c',
- init_function='LDB_MODULE(server_sort)',
+ init_function='ldb_server_sort_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_paged_searches',
'modules/paged_searches.c',
- init_function='LDB_MODULE(paged_searches)',
- enabled = s4_build,
+ init_function='ldb_paged_searches_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_rdn_name',
'modules/rdn_name.c',
- init_function='LDB_MODULE(rdn_name)',
+ init_function='ldb_rdn_name_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_sample',
'tests/sample_module.c',
- init_function='LDB_MODULE(sample)',
+ init_function='ldb_sample_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_skel',
'modules/skel.c',
- init_function='LDB_MODULE(skel)',
+ init_function='ldb_skel_init',
+ module_init_name='ldb_init_module',
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_sqlite3',
'sqlite3/ldb_sqlite3.c',
- init_function='LDB_BACKEND(sqlite3)',
+ init_function='ldb_sqlite3_init',
+ module_init_name='ldb_init_module',
enabled=False,
+ deps='ldb',
subsystem='ldb')
bld.SAMBA_MODULE('ldb_tdb',
bld.SUBDIR('ldb_tdb',
'''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c
ldb_cache.c ldb_tdb_wrap.c'''),
- init_function='LDB_BACKEND(tdb)',
- deps='tdb',
+ init_function='ldb_tdb_init',
+ module_init_name='ldb_init_module',
+ deps='tdb ldb',
subsystem='ldb')
- if s4_build:
- extra_cmdline_deps = ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \
- 'LIBCMDLINE_CREDENTIALS gensec'
- else:
- extra_cmdline_deps = ''
+ # have a separate subsystem for common/ldb.c, so it can rebuild
+ # for install with a different -DLDB_MODULESDIR=
+ bld.SAMBA_SUBSYSTEM('LIBLDB_MAIN',
+ 'common/ldb.c',
+ deps='tevent',
+ includes='include',
+ cflags=['-DLDB_MODULESDIR=\"%s\"' % modules_dir])
- bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
- 'tools/ldbutil.c tools/cmdline.c',
- 'ldb dl popt' + extra_cmdline_deps)
+ LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
+ for t in LDB_TOOLS.split():
+ bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
+ manpages='man/%s.1' % t)
- LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
- for t in LDB_TOOLS.split():
- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE',
- manpages='man/%s.1' % t)
+ # ldbtest doesn't get installed
+ bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='ldb-cmdline ldb',
+ install=False)
- # ldbtest doesn't get installed
- bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE',
- install=False)
+ bld.SAMBA_LIBRARY('ldb-cmdline',
+ source='tools/ldbutil.c tools/cmdline.c',
+ deps='ldb dl popt',
+ private_library=True)
def test(ctx):
'''run ldb testsuite'''
- import Utils
+ import Utils, samba_utils
cmd = 'tests/test-tdb.sh'
- os.system(cmd)
+ ret = samba_utils.RUN_COMMAND(cmd)
+ print("testsuite returned %d" % ret)
+ # FIXME: Run python testsuite
+ sys.exit(ret)
def dist():
'''makes a tarball for distribution'''
samba_dist.dist()
+
+def reconfigure(ctx):
+ '''reconfigure if config scripts have changed'''
+ import samba_utils
+ samba_utils.reconfigure(ctx)
git.samba.org / nivanova / samba-autobuild / .git / blobdiff