X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=wscript;h=4f823102dd5cf31131d6331671ae614e9fdd3ceb;hp=26a5c8611cea5a77cbec32c2a0e8dc8c1793666a;hb=638ed90620e3c6a35ef56a11c612c13d6b7d6ff5;hpb=2ddf89a2bc3c00b71dec230f071416e594f89113 diff --git a/wscript b/wscript old mode 100755 new mode 100644 index 26a5c8611ce..4f823102dd5 --- a/wscript +++ b/wscript @@ -6,23 +6,38 @@ blddir = 'bin' APPNAME='samba' VERSION=None -import sys, os +import sys, os, tempfile sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, Options, samba_dist, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') -samba_dist.DIST_BLACKLIST('.gitignore .bzrignore') +samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' +# This callback optionally takes a list of paths as arguments: +# --with-system_mitkrb5 /path/to/krb5 /another/path +def system_mitkrb5_callback(option, opt, value, parser): + setattr(parser.values, option.dest, True) + value = [] + for arg in parser.rargs: + # stop on --foo like options + if arg[:2] == "--" and len(arg) > 2: + break + value.append(arg) + if len(value)>0: + del parser.rargs[:len(value)] + setattr(parser.values, option.dest, value) + def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('samba4') 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('lib/nss_wrapper') @@ -33,17 +48,20 @@ def set_options(opt): opt.RECURSE('lib/util') opt.add_option('--with-system-mitkrb5', - help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base)', - action='store_true', dest='with_system_mitkrb5', default=False) + help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+ + 'You may specify list of paths where Kerberos is installed (e.g. /usr/local /usr/kerberos) to search krb5-config', + action='callback', callback=system_mitkrb5_callback, dest='with_system_mitkrb5', default=False) opt.add_option('--without-ad-dc', - help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base). Requires system MIT krb5', - action='store_true', dest='with_system_mitkrb5', default=False) + 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') - gr.add_option('--enable-build-farm', - help='enable special build farm options', - action='store_true', dest='BUILD_FARM') + + opt.add_option('--disable-ntdb', + help=("disable ntdb"), + action="store_true", dest='disable_ntdb', default=False) + opt.tool_options('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -60,9 +78,6 @@ def configure(conf): conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') conf.env.DEVELOPER = True - # this enables smbtorture.static for s3 in the build farm - conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM') - conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace') conf.RECURSE('lib/replace') @@ -95,7 +110,7 @@ def configure(conf): if Options.options.with_system_mitkrb5: conf.PROCESS_SEPARATE_RULE('system_mitkrb5') - else: + 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 @@ -108,6 +123,11 @@ def configure(conf): conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') conf.RECURSE('lib/ccan') + conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False) + if not Options.options.disable_ntdb: + conf.RECURSE('lib/ntdb') + else: + conf.DEFINE('DISABLE_NTDB', 1) conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') @@ -123,7 +143,6 @@ def configure(conf): conf.RECURSE('pidl') conf.RECURSE('selftest') conf.RECURSE('source3') - conf.RECURSE('lib/addns') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -157,7 +176,7 @@ def etags(ctx): '''build TAGS file using etags''' import Utils source_root = os.path.dirname(Utils.g_module.root_path) - cmd = 'etags $(find %s -name "*.[ch]" | egrep -v \.inst\.)' % source_root + 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) @@ -181,14 +200,14 @@ def pydoctor(ctx): '''build python apidocs''' bp = os.path.abspath('bin/python') mpaths = {} - for m in ['talloc', 'tdb', 'ldb']: + for m in ['talloc', 'tdb', 'ldb', 'ntdb']: 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']) + bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc'], mpaths['ntdb']) print("Running: %s" % cmd) os.system(cmd) @@ -216,15 +235,41 @@ def wafdocs(ctx): def dist(): '''makes a tarball for distribution''' - samba_version.load_version(env=None) - samba_dist.dist() + sambaversion = samba_version.load_version(env=None) + + 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): + os.makedirs(blddir) + distversionf = tempfile.NamedTemporaryFile(mode='w', prefix='.distversion',dir=blddir) + for field in sambaversion.vcs_fields: + distveroption = field + '=' + str(sambaversion.vcs_fields[field]) + distversionf.write(distveroption + '\n') + distversionf.flush() + samba_dist.DIST_FILES('%s:.distversion' % distversionf.name, extend=True) + + samba_dist.dist() + distversionf.close() + else: + samba_dist.dist() + def distcheck(): '''test that distribution tarball builds and installs''' samba_version.load_version(env=None) import Scripting d = Scripting.distcheck - d(subdir='source4') + d() def wildcard_cmd(cmd): '''called on a unknown command'''