X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=wscript;h=77aacef65e4215e24104904f25620a4985f95e72;hb=72785309aa2d1bed7abc6dd7c6475ff0f78411da;hp=ee0b7eeca08fc87b7fc3f0deba5e877d07a2a20d;hpb=8bf60364828c7b3b1d8f6d79b6834bc5a8ed4339;p=sfrench%2Fsamba-autobuild%2F.git diff --git a/wscript b/wscript index ee0b7eeca08..77aacef65e4 100644 --- a/wscript +++ b/wscript @@ -8,14 +8,14 @@ VERSION=None import sys, os, tempfile sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba, Options, samba_dist, Scripting, Utils, samba_version +import wafsamba, Options, samba_dist, samba_git, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') # install in /usr/local/samba by default -Options.default_prefix = '/usr/local/samba' +default_prefix = Options.default_prefix = '/usr/local/samba' # This callback optionally takes a list of paths as arguments: # --with-system_mitkrb5 /path/to/krb5 /another/path @@ -37,9 +37,9 @@ def set_options(opt): opt.RECURSE('lib/replace') opt.RECURSE('dynconfig') opt.RECURSE('lib/ldb') - opt.RECURSE('lib/ntdb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') + opt.RECURSE('source4/dsdb/samdb/ldb_modules') opt.RECURSE('pidl') opt.RECURSE('source3') opt.RECURSE('lib/util') @@ -54,6 +54,14 @@ 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) + opt.add_option('--with-ntvfs-fileserver', + help='enable the depricated NTVFS file server from the original Samba4 branch (default if --enable-selftest specicifed). Conflicts with --with-system-mitkrb5 and --without-ad-dc', + action='store_true', dest='with_ntvfs_fileserver') + + opt.add_option('--without-ntvfs-fileserver', + help='disable the depricated NTVFS file server from the original Samba4 branch', + action='store_false', dest='with_ntvfs_fileserver') + opt.add_option('--with-pie', help=("Build Position Independent Executables " + "(default if supported by compiler)"), @@ -70,14 +78,6 @@ def set_options(opt): 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 @@ -103,7 +103,7 @@ def configure(conf): conf.SAMBA_CHECK_PERL(mandatory=True) conf.find_program('xsltproc', var='XSLTPROC') - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) + conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2, 6, 0)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: @@ -123,8 +123,7 @@ def configure(conf): conf.RECURSE('dynconfig') if conf.CHECK_FOR_THIRD_PARTY(): - conf.RECURSE('third_party/zlib') - conf.RECURSE('third_party/popt') + conf.RECURSE('third_party') 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.') @@ -138,10 +137,14 @@ def configure(conf): conf.RECURSE('lib/ldb') + if not (Options.options.without_ad_dc): + conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + if Options.options.with_system_mitkrb5: conf.PROCESS_SEPARATE_RULE('system_mitkrb5') if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + # Only process heimdal_build for non-MIT KRB5 builds # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set # to the lowcased output of 'krb5-config --vendor'. @@ -150,26 +153,39 @@ def configure(conf): if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'): conf.RECURSE('source4/heimdal_build') conf.RECURSE('source4/lib/tls') + conf.RECURSE('source4/dsdb/samdb/ldb_modules') conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') - conf.RECURSE('lib/ccan') - conf.RECURSE('lib/ntdb') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') - conf.RECURSE('lib/nss_wrapper') conf.RECURSE('nsswitch') - conf.RECURSE('lib/socket_wrapper') - conf.RECURSE('lib/uid_wrapper') - conf.RECURSE('lib/subunit/c') conf.RECURSE('libcli/smbreadline') conf.RECURSE('lib/crypto') conf.RECURSE('pidl') conf.RECURSE('selftest') + if conf.CONFIG_GET('ENABLE_SELFTEST'): + conf.RECURSE('lib/nss_wrapper') + conf.RECURSE('lib/resolv_wrapper') + conf.RECURSE('lib/socket_wrapper') + conf.RECURSE('lib/uid_wrapper') + if Options.options.with_ntvfs_fileserver != False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) + if Options.options.with_ntvfs_fileserver == False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC') + + if Options.options.with_ntvfs_fileserver == True: + if Options.options.without_ad_dc: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc') + if Options.options.with_system_mitkrb5: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --with-system-mitkrb5') + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) conf.RECURSE('source3') conf.RECURSE('lib/texpect') - if Options.options.with_cluster_support: - conf.env.with_ctdb = True + if conf.env.with_ctdb: conf.RECURSE('ctdb') + conf.RECURSE('lib/socket') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -178,17 +194,11 @@ def configure(conf): # allows us to find problems on our development hosts faster. # It also results in faster load time. - if not sys.platform.startswith("openbsd"): - conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) + conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) if not conf.CHECK_NEED_LC("-lc not needed"): conf.ADD_LDFLAGS('-lc', testflags=False) - # we don't want PYTHONDIR in config.h, as otherwise changing - # --prefix causes a complete rebuild - del(conf.env.defines['PYTHONDIR']) - del(conf.env.defines['PYTHONARCHDIR']) - if not conf.CHECK_CODE('#include "tests/summary.c"', define='SUMMARY_PASSES', addmain=False, @@ -203,7 +213,7 @@ def configure(conf): 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 + conf.env['ENABLE_PIE'] = True if Options.options.enable_relro != False: if Options.options.enable_relro == True: @@ -215,20 +225,6 @@ def configure(conf): 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): @@ -251,19 +247,19 @@ def ctags(ctx): 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 = {} - modules = ['talloc', 'tdb', 'ldb', 'ntdb'] + modules = ['talloc', 'tdb', 'ldb'] for m in modules: f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r') try: @@ -310,6 +306,9 @@ 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) @@ -344,6 +343,7 @@ def wildcard_cmd(cmd): def main(): from samba_wildcard import wildcard_main + wildcard_main(wildcard_cmd) Scripting.main = main @@ -351,3 +351,10 @@ def reconfigure(ctx): '''reconfigure if config scripts have changed''' import samba_utils samba_utils.reconfigure(ctx) + + +if os.path.isdir(os.path.join(srcdir, ".git")): + # Check if there are submodules that are checked out but out of date. + for submodule, status in samba_git.read_submodule_status(srcdir): + if status == "out-of-date": + raise Utils.WafError("some submodules are out of date. Please run 'git submodule update'")