X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=lib%2Ftalloc%2Fwscript;h=f254e55654b93e0b6127f8b20d0d76cd514bc496;hb=b915626087c2340c7cd89cd2ecb7a8b20a756c0a;hp=3d359c1281b64af4b9a64180646505d632cf0f08;hpb=ebe2867fc2c01fb5288d62eedb0e2f43788b9f27;p=samba.git diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 3d359c1281b..f254e55654b 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -1,39 +1,36 @@ #!/usr/bin/env python APPNAME = 'talloc' -VERSION = '2.0.4' +VERSION = '2.1.15' - -blddir = 'bin' - -import Logs -import os, sys +import os +import sys # 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') -import sys -sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba, samba_dist, Options +out = 'bin' + +import wafsamba +from wafsamba import samba_dist, samba_utils +from waflib import Logs, Options, Context # setup what directories to put in a tarball -samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools') +samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace +buildtools:buildtools third_party/waf:third_party/waf""") -def set_options(opt): +def options(opt): 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('--disable-python', - help=("disable the pytalloc module"), - action="store_true", dest='disable_python', default=False) + opt.add_option('--enable-talloc-compat1', + help=("Build talloc 1.x.x compat library [False]"), + action="store_true", dest='TALLOC_COMPAT1', default=False) def configure(conf): @@ -41,55 +38,91 @@ def configure(conf): conf.env.standalone_talloc = conf.IN_LAUNCH_DIR() - conf.env.disable_python = getattr(Options.options, 'disable_python', False) - - if not conf.env.standalone_talloc: - if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - if conf.CHECK_BUNDLED_SYSTEM('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) + conf.define('TALLOC_BUILD_VERSION_MAJOR', int(VERSION.split('.')[0])) + conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1])) + conf.define('TALLOC_BUILD_VERSION_RELEASE', int(VERSION.split('.')[2])) - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 + conf.env.TALLOC_COMPAT1 = False + if conf.env.standalone_talloc: + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 + conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + conf.env.TALLOC_VERSION = VERSION conf.CHECK_XSLTPROC_MANPAGES() + conf.CHECK_HEADERS('sys/auxv.h') + conf.CHECK_FUNCS('getauxval') + + conf.SAMBA_CONFIG_H() + + conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() + + # We need to set everything non-python up before here, because + # SAMBA_CHECK_PYTHON makes a copy of conf and we need it set up correctly + if not conf.env.disable_python: # also disable if we don't have the python libs installed - conf.check_tool('python') - conf.check_python_version((2,4,2)) - conf.check_python_headers(mandatory=False) + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2)) + 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() + if not conf.env.standalone_talloc: + if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TALLOC', 1) + + if conf.env.disable_python: + using_system_pytalloc_util = False + else: + using_system_pytalloc_util = True + name = 'pytalloc-util' + conf.all_envs['default']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, + implied_deps='talloc replace'): + using_system_pytalloc_util = False + # We need to get a pytalloc-util for all the python versions + # we are building for + if conf.env['EXTRA_PYTHON']: + name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, + implied_deps='talloc replace'): + using_system_pytalloc_util = False + + if using_system_pytalloc_util: + conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) 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) + testsuite_deps = 'talloc' + if bld.CONFIG_SET('HAVE_PTHREAD'): + testsuite_deps += ' pthread' + + bld.SAMBA_BINARY('talloc_testsuite', + 'testsuite_main.c testsuite.c', + testsuite_deps, + install=False) + + bld.SAMBA_BINARY('talloc_test_magic_differs_helper', + 'test_magic_differs_helper.c', + 'talloc', install=False) + else: private_library = True - vnum = None if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): @@ -99,43 +132,65 @@ def build(bld): abi_directory='ABI', abi_match='talloc* _talloc*', hide_symbols=True, - vnum=vnum, + vnum=VERSION, + public_headers=('' if private_library else 'talloc.h'), + pc_files='talloc.pc', + public_headers_install=not private_library, private_library=private_library, - manpages='talloc.3') - - if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python: - - bld.SAMBA_LIBRARY('pytalloc-util', - source='pytalloc_util.c', - public_deps='talloc', - abi_directory='ABI', - abi_match='py* Py*', - pyext=True, - vnum=vnum, - private_library=private_library, - ) - bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h') - bld.SAMBA_PYTHON('pytalloc', - 'pytalloc.c', - deps='talloc pytalloc-util', - enabled=True, - realname='talloc.so') - - 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) + manpages='man/talloc.3') + + if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): + name = bld.pyembed_libname('pytalloc-util') + + bld.SAMBA_LIBRARY(name, + source='pytalloc_util.c', + public_deps='talloc', + pyembed=True, + vnum=VERSION, + hide_symbols=True, + abi_directory='ABI', + abi_match='pytalloc_* _pytalloc_*', + private_library=private_library, + public_headers=('' if private_library else 'pytalloc.h'), + pc_files='pytalloc-util.pc', + enabled=bld.PYTHON_BUILD_IS_ENABLED() + ) + bld.SAMBA_PYTHON('pytalloc', + 'pytalloc.c', + deps='talloc ' + name, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + realname='talloc.so') + + bld.SAMBA_PYTHON('test_pytalloc', + 'test_pytalloc.c', + deps=name, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + realname='_test_pytalloc.so', + install=False) def test(ctx): '''run talloc testsuite''' - import Utils, samba_utils - cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite') + import samba_utils + + samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') + samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') + + cmd = os.path.join(Context.g_module.out, 'talloc_testsuite') ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) - sys.exit(ret) + magic_helper_cmd = os.path.join(Context.g_module.out, 'talloc_test_magic_differs_helper') + magic_cmd = os.path.join(Context.g_module.top, 'lib', 'talloc', + 'test_magic_differs.sh') + if not os.path.exists(magic_cmd): + magic_cmd = os.path.join(Context.g_module.top, 'test_magic_differs.sh') + + magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd) + print("magic differs test returned %d" % magic_ret) + pyret = samba_utils.RUN_PYTHON_TESTS(['test_pytalloc.py']) + print("python testsuite returned %d" % pyret) + sys.exit(ret or magic_ret or pyret) def dist(): '''makes a tarball for distribution''' @@ -143,5 +198,11 @@ def 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)