From 91e099d61f8044668f7f37244337f6f2f835a2e8 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 2 Feb 2018 16:34:32 +0200 Subject: [PATCH] source3/wscript: update to handle waf 2.0.4 Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- source3/script/wscript_build | 2 +- source3/wscript | 27 ++++++++++++++------------- source3/wscript_build | 3 --- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/source3/script/wscript_build b/source3/script/wscript_build index 25591ea7621..40ecdd7ef50 100644 --- a/source3/script/wscript_build +++ b/source3/script/wscript_build @@ -22,4 +22,4 @@ bld.SAMBA_GENERATOR('findsmb-script', bld.INSTALL_FILES('${BINDIR}', 'findsmb', destname='findsmb', - chmod=0755) + chmod=MODE_755) diff --git a/source3/wscript b/source3/wscript index 6a40f239572..9037b6488c4 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1,20 +1,23 @@ #!/usr/bin/env python -srcdir=".." +srcdir = ".." import sys, os from optparse import SUPPRESS_HELP -sys.path.insert(0, srcdir+"/buildtools/wafsamba") +sys.path.insert(0, srcdir + "/buildtools/wafsamba") sys.path.insert(0, "source3") -import wafsamba, Options, Logs, Utils, Scripting + +from waflib import Options, Logs, Errors +import wafsamba import build.charset -import samba_utils, samba_version +from wafsamba import samba_utils +from samba_utils import TO_LIST import samba3 -import bison, flex +from waflib.Tools import bison, flex default_prefix = Options.default_prefix = '/usr/local/samba' -def set_options(opt): +def options(opt): opt.add_option('--with-static-modules', help=("Comma-separated list of names of modules to statically link in. "+ @@ -78,8 +81,6 @@ def set_options(opt): opt.SAMBA3_ADD_OPTION('spotlight', with_name="enable", without_name="disable", default=False) def configure(conf): - from samba_utils import TO_LIST - default_static_modules = [] default_shared_modules = [] required_static_modules = [] @@ -226,7 +227,7 @@ main() { "libarchive support is required for the smbclient " "tar-file mode") elif conf.CONFIG_GET('ENABLE_SELFTEST'): - raise Utils.WafError('libarchive library required for ' + raise Errors.WafError('libarchive library required for ' '--enable-selftest') @@ -1769,13 +1770,13 @@ main() { if m.startswith('!'): m = m[1:] if m in required_static_modules: - raise Utils.WafError('These modules are REQUIRED as static modules: %s' % + raise Errors.WafError('These modules are REQUIRED as static modules: %s' % ' '.join(required_static_modules)) if m in final_static_modules: final_static_modules.remove(m) continue if m in forced_shared_modules: - raise Utils.WafError('These modules MUST be configured as shared modules: %s' % + raise Errors.WafError('These modules MUST be configured as shared modules: %s' % ' '.join(forced_shared_modules)) if m in final_shared_modules: final_shared_modules.remove(m) @@ -1790,10 +1791,10 @@ main() { final_shared_modules.remove(m) continue if m in required_static_modules: - raise Utils.WafError('These modules are REQUIRED as static modules: %s' % + raise Errors.WafError('These modules are REQUIRED as static modules: %s' % ' '.join(required_static_modules)) if m in forced_static_modules: - raise Utils.WafError('These module MUST be configured as static modules: %s' % + raise Errors.WafError('These module MUST be configured as static modules: %s' % ' '.join(forced_static_modules)) if m in final_static_modules: final_static_modules.remove(m) diff --git a/source3/wscript_build b/source3/wscript_build index f463a8c4261..b532a3bec77 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1,8 +1,5 @@ #!/usr/bin/env python -from samba_utils import * -import samba_version, samba3 - LIBS='ICONV' config_h = "../include/config.h" -- 2.34.1