X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=wscript;h=9168db122ae66f0287ec34bde289ad5bb5c7ffff;hp=ae4ff50b6d194f74adf50b83f1a3090a59fedd17;hb=21cac65b67b2f9880586404f6492260541f05e30;hpb=00288191bf343a9382ac49ccf4c86b3bde86e2f8 diff --git a/wscript b/wscript index ae4ff50b6d1..9168db122ae 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/alpha13 source4/selftest/provisions/release-4-0-0/ source4/selftest/provisions/release-4-1-0rc3/') +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,12 +37,13 @@ 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') + opt.RECURSE('ctdb') opt.add_option('--with-system-mitkrb5', help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+ @@ -53,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)"), @@ -71,7 +80,6 @@ def set_options(opt): gr = opt.option_group('developer options') - opt.tool_options('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -89,12 +97,15 @@ 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.RECURSE('examples/fuse') + + 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']: @@ -112,12 +123,30 @@ 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') + 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 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'. @@ -126,25 +155,40 @@ 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/zlib') 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/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') + 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 conf.env.with_ctdb: + conf.RECURSE('ctdb') + conf.RECURSE('lib/socket') + conf.RECURSE('testsuite/unittests') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -153,24 +197,16 @@ 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, 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: @@ -180,7 +216,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: @@ -192,13 +228,17 @@ def configure(conf): msg="Checking compiler for full RELRO support"): conf.env['ENABLE_RELRO'] = True + conf.SAMBA_CONFIG_H('include/config.h') + def etags(ctx): '''build TAGS file using etags''' import Utils 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" @@ -206,37 +246,47 @@ 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'] + 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): @@ -250,13 +300,18 @@ 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) @@ -291,6 +346,7 @@ def wildcard_cmd(cmd): def main(): from samba_wildcard import wildcard_main + wildcard_main(wildcard_cmd) Scripting.main = main @@ -298,3 +354,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'")