diff options
author | Thomas Nagy <tnagy@waf.io> | 2015-11-07 00:57:36 +0100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-16 11:48:14 +0100 |
commit | cfe8becb9e62b9e15119107d186628c784a3d38c (patch) | |
tree | 2552410fddea9e1b46babd57220614e4e891b1e8 /buildtools | |
parent | 44bf7c2a12e0bd806552f8cbe0b013a5d07e0218 (diff) | |
download | samba-cfe8becb9e62b9e15119107d186628c784a3d38c.tar.gz |
build:wafsamba: Replace Options.is_install by bld.is_install
Options.is_install is a deprecated module variable that is more
verbose than bld.is_install and complicates the Waf 1.8 upgrade.
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r-- | buildtools/wafsamba/samba_install.py | 6 | ||||
-rw-r--r-- | buildtools/wafsamba/samba_patterns.py | 3 | ||||
-rw-r--r-- | buildtools/wafsamba/samba_wildcard.py | 1 | ||||
-rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 5f399f9ff2b..8297ce4f9c0 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -4,7 +4,7 @@ # library use import os -import Options, Utils +import Utils from TaskGen import feature, before, after from samba_utils import LIB_PATH, MODE_755, install_rpath, build_rpath @@ -19,7 +19,7 @@ def install_binary(self): install_ldflags = install_rpath(self) build_ldflags = build_rpath(bld) - if not Options.is_install: + if not self.bld.is_install: # just need to set rpath if we are not installing self.env.RPATH = build_ldflags return @@ -68,7 +68,7 @@ def install_library(self): install_ldflags = install_rpath(self) build_ldflags = build_rpath(bld) - if not Options.is_install or not getattr(self, 'samba_install', True): + if not self.bld.is_install or not getattr(self, 'samba_install', True): # just need to set the build rpath if we are not installing self.env.RPATH = build_ldflags return diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index 9c6d499fe34..ceca2cce5f7 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -7,7 +7,7 @@ def write_version_header(task): '''print version.h contents''' src = task.inputs[0].srcpath(task.env) - version = samba_version_file(src, task.env.srcdir, env=task.env, is_install=task.env.is_install) + version = samba_version_file(src, task.env.srcdir, env=task.env, is_install=task.generator.bld.is_install) string = str(version) task.outputs[0].write(string) @@ -25,7 +25,6 @@ def SAMBA_MKVERSION(bld, target): source= 'VERSION', target=target, always=bld.is_install) - t.env.is_install = bld.is_install Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION diff --git a/buildtools/wafsamba/samba_wildcard.py b/buildtools/wafsamba/samba_wildcard.py index 3d874814df2..ed3e0c26b8d 100644 --- a/buildtools/wafsamba/samba_wildcard.py +++ b/buildtools/wafsamba/samba_wildcard.py @@ -130,7 +130,6 @@ def fake_build_environment(info=True, flush=False): Options.commands['install'] = False Options.commands['uninstall'] = False - Options.is_install = False bld.is_install = 0 # False diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index a8e122c9575..a17b609f8a0 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -282,7 +282,7 @@ def SAMBA_LIBRARY(bld, libname, source, if not vscriptpath: raise Utils.WafError("unable to find vscript path for %s" % vscript) bld.add_manual_dependency(fullpath, vscriptpath) - if Options.is_install: + if bld.is_install: # also make the .inst file depend on the vscript instname = apply_pattern(bundled_name + '.inst', bld.env.shlib_PATTERN) bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript)) |