X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=d5a4ccb7bac93a03bc5f538ddd251d8da1ca2e08;hb=fbf5f0f1cb13bdf6bf6f6c677bbbc64680711f6e;hp=3509939a7ba0dfe024123b6da17845c0e391e6eb;hpb=2fda6c47f4aa46dbb42028732207a94821881c67;p=obnox%2Fsamba%2Fsamba-obnox.git diff --git a/wscript b/wscript index 3509939a7ba..d5a4ccb7bac 100644 --- a/wscript +++ b/wscript @@ -12,7 +12,7 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') -samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13 source4/selftest/provisions/release-4-0-0/') +samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' @@ -40,12 +40,10 @@ def set_options(opt): opt.RECURSE('lib/ntdb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') - opt.RECURSE('lib/nss_wrapper') - opt.RECURSE('lib/socket_wrapper') - opt.RECURSE('lib/uid_wrapper') opt.RECURSE('pidl') opt.RECURSE('source3') opt.RECURSE('lib/util') + opt.RECURSE('ctdb') opt.add_option('--with-system-mitkrb5', help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+ @@ -56,8 +54,31 @@ def set_options(opt): help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).', action='store_true', dest='without_ad_dc', default=False) - gr = opt.option_group('developer options') + opt.add_option('--with-pie', + help=("Build Position Independent Executables " + + "(default if supported by compiler)"), + action="store_true", dest='enable_pie') + opt.add_option('--without-pie', + help=("Disable Position Independent Executable builds"), + action="store_false", dest='enable_pie') + + opt.add_option('--with-relro', + help=("Build with full RELocation Read-Only (RELRO)" + + "(default if supported by compiler)"), + action="store_true", dest='enable_relro') + opt.add_option('--without-relro', + help=("Disable RELRO builds"), + action="store_false", dest='enable_relro') + + opt.add_option('--with-systemd', + help=("Enable systemd integration"), + action='store_true', dest='enable_systemd') + + opt.add_option('--without-systemd', + help=("Disable systemd integration"), + action='store_false', dest='enable_systemd') + gr = opt.option_group('developer options') opt.tool_options('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -76,9 +97,10 @@ def configure(conf): conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace') + conf.env.replace_add_global_pthread = True conf.RECURSE('lib/replace') - conf.find_program('perl', var='PERL', mandatory=True) + conf.SAMBA_CHECK_PERL(mandatory=True) conf.find_program('xsltproc', var='XSLTPROC') conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) @@ -99,6 +121,21 @@ def configure(conf): raise Utils.WafError('Python version 3.x is not supported by Samba yet') conf.RECURSE('dynconfig') + + if conf.CHECK_FOR_THIRD_PARTY(): + conf.RECURSE('third_party/zlib') + conf.RECURSE('third_party/popt') + else: + if not conf.CHECK_ZLIB(): + raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') + else: + conf.define('USING_SYSTEM_ZLIB',1) + + 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.') + else: + conf.define('USING_SYSTEM_POPT', 1) + conf.RECURSE('lib/ldb') if Options.options.with_system_mitkrb5: @@ -117,21 +154,22 @@ def configure(conf): conf.RECURSE('lib/util') conf.RECURSE('lib/ccan') conf.RECURSE('lib/ntdb') - conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') conf.RECURSE('lib/nss_wrapper') conf.RECURSE('nsswitch') + conf.RECURSE('lib/resolv_wrapper') conf.RECURSE('lib/socket_wrapper') conf.RECURSE('lib/uid_wrapper') - conf.RECURSE('lib/popt') - conf.RECURSE('lib/iniparser/src') conf.RECURSE('lib/subunit/c') conf.RECURSE('libcli/smbreadline') conf.RECURSE('lib/crypto') conf.RECURSE('pidl') conf.RECURSE('selftest') conf.RECURSE('source3') + conf.RECURSE('lib/texpect') + if conf.env.with_ctdb: + conf.RECURSE('ctdb') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -154,12 +192,44 @@ def configure(conf): if not conf.CHECK_CODE('#include "tests/summary.c"', define='SUMMARY_PASSES', addmain=False, - execute=True, msg='Checking configure summary'): raise Utils.WafError('configure summary failed') - - conf.SAMBA_CONFIG_H('include/config.h') + if Options.options.enable_pie != False: + if Options.options.enable_pie == True: + need_pie = True + else: + # not specified, only build PIEs if supported by compiler + need_pie = False + if conf.check_cc(cflags='-fPIE', ldflags='-pie', mandatory=need_pie, + msg="Checking compiler for PIE support"): + conf.env['ENABLE_PIE'] = True + + if Options.options.enable_relro != False: + if Options.options.enable_relro == True: + need_relro = True + else: + # not specified, only build RELROs if supported by compiler + need_relro = False + if conf.check_cc(cflags='', ldflags='-Wl,-z,relro,-z,now', mandatory=need_relro, + msg="Checking compiler for full RELRO support"): + conf.env['ENABLE_RELRO'] = True + + if Options.options.enable_systemd != False: + conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs', + msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON") + conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon') + conf.CHECK_LIB('systemd-daemon', shlib=True) + + if (conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and + conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON')): + conf.DEFINE('HAVE_SYSTEMD', '1') + conf.env['ENABLE_SYSTEMD'] = True + else: + conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY') + conf.undefine('HAVE_SYSTEMD') + + conf.SAMBA_CONFIG_H('include/config.h') def etags(ctx): '''build TAGS file using etags''' @@ -167,7 +237,9 @@ def etags(ctx): source_root = os.path.dirname(Utils.g_module.root_path) cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root) print("Running: %s" % cmd) - os.system(cmd) + status = os.system(cmd) + if os.WEXITSTATUS(status): + raise Utils.WafError('etags failed') def ctags(ctx): "build 'tags' file using ctags" @@ -175,37 +247,46 @@ def ctags(ctx): source_root = os.path.dirname(Utils.g_module.root_path) 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) + status = os.system(cmd) + if os.WEXITSTATUS(status): + raise Utils.WafError('ctags failed') # putting this here enabled build in the list # of commands in --help def build(bld): '''build all targets''' samba_version.load_version(env=bld.env, is_install=bld.is_install) - pass def pydoctor(ctx): '''build python apidocs''' bp = os.path.abspath('bin/python') mpaths = {} - for m in ['talloc', 'tdb', 'ldb', 'ntdb']: + modules = ['talloc', 'tdb', 'ldb', 'ntdb'] + for m in modules: f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r') try: mpaths[m] = f.read().strip() finally: f.close() - cmd='PYTHONPATH=%s pydoctor --introspect-c-modules --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba --add-module %s --add-module %s --add-module %s' % ( - bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc'], mpaths['ntdb']) + mpaths['main'] = bp + cmd = ('PYTHONPATH=%(main)s pydoctor --introspect-c-modules --project-name=Samba ' + '--project-url=http://www.samba.org --make-html --docformat=restructuredtext ' + '--add-package bin/python/samba ' + ''.join('--add-module %s ' % n for n in modules)) + cmd = cmd % mpaths print("Running: %s" % cmd) - os.system(cmd) + status = os.system(cmd) + if os.WEXITSTATUS(status): + raise Utils.WafError('pydoctor failed') def pep8(ctx): '''run pep8 validator''' cmd='PYTHONPATH=bin/python pep8 -r bin/python/samba' print("Running: %s" % cmd) - os.system(cmd) + status = os.system(cmd) + if os.WEXITSTATUS(status): + raise Utils.WafError('pep8 failed') def wafdocs(ctx): @@ -219,23 +300,21 @@ def wafdocs(ctx): for f in list: cmd += ' --add-module %s' % f print("Running: %s" % cmd) - os.system(cmd) + status = os.system(cmd) + if os.WEXITSTATUS(status): + raise Utils.WafError('wafdocs failed') def dist(): '''makes a tarball for distribution''' sambaversion = samba_version.load_version(env=None) + os.system("make -C ctdb/doc") + samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True) + os.system(srcdir + "/release-scripts/build-manpages-nogit") samba_dist.DIST_FILES('bin/docs:docs', extend=True) - os.system(srcdir + "/source3/autogen.sh") - samba_dist.DIST_FILES('source3/configure', extend=True) - samba_dist.DIST_FILES('source3/autoconf', extend=True) - samba_dist.DIST_FILES('source3/include/autoconf', extend=True) - samba_dist.DIST_FILES('examples/VFS/configure', extend=True) - samba_dist.DIST_FILES('examples/VFS/module_config.h.in', extend=True) - if sambaversion.IS_SNAPSHOT: # write .distversion file and add to tar if not os.path.isdir(blddir):