#!/usr/bin/env python
APPNAME = 'talloc'
-VERSION = '2.0.3'
+VERSION = '2.1.0'
blddir = 'bin'
opt.BUILTIN_DEFAULT('replace')
opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
opt.RECURSE('lib/replace')
- opt.add_option('--enable-talloc-compat1',
- help=("Build talloc 1.x.x compat library [False]"),
- action="store_true", dest='TALLOC_COMPAT1', default=False)
if opt.IN_LAUNCH_DIR():
+ opt.add_option('--enable-talloc-compat1',
+ help=("Build talloc 1.x.x compat library [False]"),
+ action="store_true", dest='TALLOC_COMPAT1', default=False)
opt.add_option('--disable-python',
- help=("disable the pytevent module"),
+ help=("disable the pytalloc module"),
action="store_true", dest='disable_python', default=False)
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
if not conf.env.standalone_talloc:
- if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
implied_deps='replace'):
conf.define('USING_SYSTEM_TALLOC', 1)
- if conf.CHECK_BUNDLED_SYSTEM('pytalloc-util', minversion=VERSION,
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
implied_deps='talloc replace'):
conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
-
+ conf.env.TALLOC_COMPAT1 = False
if conf.env.standalone_talloc:
- conf.find_program('xsltproc', var='XSLTPROC')
+ conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+
+ conf.CHECK_XSLTPROC_MANPAGES()
if not conf.env.disable_python:
# also disable if we don't have the python libs installed
+ conf.find_program('python', var='PYTHON')
conf.check_tool('python')
conf.check_python_version((2,4,2))
- conf.check_python_headers(mandatory=False)
+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
if not conf.env.HAVE_PYTHON_H:
Logs.warn('Disabling pytalloc-util as python devel libs not found')
conf.env.disable_python = True
conf.SAMBA_CONFIG_H()
+ conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
+
def build(bld):
bld.RECURSE('lib/replace')
if bld.env.standalone_talloc:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
bld.env.TALLOC_VERSION = VERSION
- bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
- bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
private_library = False
- vnum = VERSION
# should we also install the symlink to libtalloc1.so here?
bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
'compat/talloc_compat1.c',
public_deps='talloc',
soname='libtalloc.so.1',
+ pc_files=[],
+ public_headers=[],
enabled=bld.env.TALLOC_COMPAT1)
- if not bld.env.disable_python:
- bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
+ bld.SAMBA_BINARY('talloc_testsuite',
+ 'testsuite_main.c testsuite.c',
+ deps='talloc',
+ install=False)
+
else:
private_library = True
- vnum = None
if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
bld.SAMBA_LIBRARY('talloc',
'talloc.c',
deps='replace',
- abi_file='ABI/talloc-%s.sigs' % VERSION,
+ abi_directory='ABI',
abi_match='talloc* _talloc*',
hide_symbols=True,
- vnum=vnum,
+ vnum=VERSION,
+ public_headers='talloc.h',
+ pc_files='talloc.pc',
+ public_headers_install=not private_library,
private_library=private_library,
- manpages='talloc.3')
+ manpages='man/talloc.3')
if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
-
bld.SAMBA_LIBRARY('pytalloc-util',
- source='pytalloc.c',
+ source='pytalloc_util.c',
public_deps='talloc',
- pyext=True,
+ pyembed=True,
vnum=VERSION,
+ hide_symbols=True,
+ abi_directory='ABI',
+ abi_match='pytalloc_*',
+ private_library=private_library,
+ public_headers='pytalloc.h',
+ pc_files='pytalloc-util.pc'
)
-
- if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
- # s4 already has the talloc testsuite builtin to smbtorture
- bld.SAMBA_BINARY('talloc_testsuite',
- 'testsuite_main.c testsuite.c',
- deps='talloc',
- install=False)
-
+ bld.SAMBA_PYTHON('pytalloc',
+ 'pytalloc.c',
+ deps='talloc pytalloc-util',
+ enabled=True,
+ realname='talloc.so')
def test(ctx):
'''run talloc testsuite'''
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)
+
+
+def pydoctor(ctx):
+ '''build python apidocs'''
+ cmd='PYTHONPATH=bin/python pydoctor --project-name=talloc --project-url=http://talloc.samba.org/ --make-html --docformat=restructuredtext --introspect-c-modules --add-module bin/python/talloc.*'
+ print("Running: %s" % cmd)
+ os.system(cmd)