>From 25e0a9efa92b761394801ff6f56f2298d3ac7e9b Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Tue, 7 Feb 2017 22:58:40 -0800 Subject: [PATCH 1/3] wafsamba: Move command line option function labelled as 'samba3' to the common set of functions It allows to be used for things that are not 'samba3' only (or more accurately things not in common and not related to the AD DC implementation) Signed-off-by: Matthieu Patou Change-Id: I87497a7f48e689d590eaef4b65f69a002c9a1fff --- buildtools/wafsamba/samba3.py | 31 ++----------------------------- buildtools/wafsamba/samba_utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 6d06fd9..44daff9 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -2,37 +2,10 @@ # and for SAMBA_ macros for building libraries, binaries etc import Options, Build, os -from optparse import SUPPRESS_HELP -from samba_utils import os_path_relpath, TO_LIST +from samba_utils import os_path_relpath, TO_LIST, samba_add_onoff_option from samba_autoconf import library_flags - -def SAMBA3_ADD_OPTION(opt, option, help=(), dest=None, default=True, - with_name="with", without_name="without"): - if default is None: - default_str = "auto" - elif default is True: - default_str = "yes" - elif default is False: - default_str = "no" - else: - default_str = str(default) - - if help == (): - help = ("Build with %s support (default=%s)" % (option, default_str)) - if dest is None: - dest = "with_%s" % option.replace('-', '_') - - with_val = "--%s-%s" % (with_name, option) - without_val = "--%s-%s" % (without_name, option) - - #FIXME: This is broken and will always default to "default" no matter if - # --with or --without is chosen. - opt.add_option(with_val, help=help, action="store_true", dest=dest, - default=default) - opt.add_option(without_val, help=SUPPRESS_HELP, action="store_false", - dest=dest) -Options.Handler.SAMBA3_ADD_OPTION = SAMBA3_ADD_OPTION +Options.Handler.SAMBA3_ADD_OPTION = samba_add_onoff_option def SAMBA3_IS_STATIC_MODULE(bld, module): '''Check whether module is in static list''' diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 49a8759..f5c0c53 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -2,6 +2,7 @@ # and for SAMBA_ macros for building libraries, binaries etc import os, sys, re, fnmatch, shlex +from optparse import SUPPRESS_HELP import Build, Options, Utils, Task, Logs, Configure from TaskGen import feature, before, after from Configure import conf, ConfigurationContext @@ -669,3 +670,29 @@ def samba_before_apply_obj_vars(self): if is_standard_libpath(v, i): v['LIBPATH'].remove(i) +def samba_add_onoff_option(opt, option, help=(), dest=None, default=True, + with_name="with", without_name="without"): + if default is None: + default_str = "auto" + elif default is True: + default_str = "yes" + elif default is False: + default_str = "no" + else: + default_str = str(default) + + if help == (): + help = ("Build with %s support (default=%s)" % (option, default_str)) + if dest is None: + dest = "with_%s" % option.replace('-', '_') + + with_val = "--%s-%s" % (with_name, option) + without_val = "--%s-%s" % (without_name, option) + + #FIXME: This is broken and will always default to "default" no matter if + # --with or --without is chosen. + opt.add_option(with_val, help=help, action="store_true", dest=dest, + default=default) + opt.add_option(without_val, help=SUPPRESS_HELP, action="store_false", + dest=dest) +Options.Handler.samba_add_onoff_option = samba_add_onoff_option -- 2.7.4