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/wafsamba/samba_patterns.py | |
| 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/wafsamba/samba_patterns.py')
| -rw-r--r-- | buildtools/wafsamba/samba_patterns.py | 3 |
1 files changed, 1 insertions, 2 deletions
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 |