X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=18daaac08cdf9ba37f7949e109dacffaf7306142;hb=d581c9d284e7c635b0379d57e95cb32e682f0f02;hp=8454146ba53e906ec12987690814444a415610f6;hpb=2a789c8442ce730cac112eeb89c7eb497bb5cc15;p=kai%2Fsamba.git diff --git a/wscript b/wscript index 8454146ba53..18daaac08cd 100755 --- a/wscript +++ b/wscript @@ -16,8 +16,6 @@ samba_dist.DIST_DIRS('.') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' -os.environ['TOPLEVEL_BUILD'] = '1' - def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('samba4') @@ -42,11 +40,9 @@ def set_options(opt): def configure(conf): - conf.env.toplevel_build = True version = samba_version.load_version(env=conf.env) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) - conf.DEFINE('_SAMBA_WAF_BUILD_', version.MAJOR) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) @@ -105,15 +101,7 @@ def configure(conf): conf.RECURSE('selftest') conf.RECURSE('source3') - # we don't want any libraries or modules to rely on runtime - # resolution of symbols - if sys.platform != "openbsd4": - conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) - - if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []: - if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): - conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] - + conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() # gentoo always adds this. We want our normal build to be as # strict as the strictest OS we support, so adding this here @@ -146,7 +134,7 @@ def ctags(ctx): "build 'tags' file using ctags" import Utils source_root = os.path.dirname(Utils.g_module.root_path) - cmd = 'ctags $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.)' % source_root + cmd = 'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root) print("Running: %s" % cmd) os.system(cmd) @@ -164,6 +152,14 @@ def pydoctor(ctx): print("Running: %s" % cmd) os.system(cmd) + +def pep8(ctx): + '''run pep8 validator''' + cmd='PYTHONPATH=bin/python pep8 -r bin/python/samba' + print("Running: %s" % cmd) + os.system(cmd) + + def wafdocs(ctx): '''build wafsamba apidocs''' from samba_utils import recursive_dirlist