From 6520bd13cc6ca45092cb51564d1e088757e8b83e Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Mon, 19 May 2014 21:38:08 +0200 Subject: - removed superfluous method "smart_cxxflags" in AIX tool (fixes #2160) --- src/engine/SCons/Tool/aixc++.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/engine/SCons/Tool/aixc++.py b/src/engine/SCons/Tool/aixc++.py index c86d530..f03f763 100644 --- a/src/engine/SCons/Tool/aixc++.py +++ b/src/engine/SCons/Tool/aixc++.py @@ -45,12 +45,6 @@ def get_xlc(env): xlc = env.get('CXX', 'xlC') return SCons.Platform.aix.get_xlc(env, xlc, packages) -def smart_cxxflags(source, target, env, for_signature): - build_dir = env.GetBuildPath() - if build_dir: - return '-qtempinc=' + os.path.join(build_dir, 'tempinc') - return '' - def generate(env): """Add Builders and construction variables for xlC / Visual Age suite to an Environment.""" -- cgit v0.12 From c36de026dc80becfe5abbfa617203b17ab3c0c7a Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Tue, 20 May 2014 19:28:50 +0200 Subject: - allow varlist to be specified as list of strings, fixes issue #2754 --- src/CHANGES.txt | 1 + src/engine/SCons/Action.py | 2 +- src/engine/SCons/ActionTests.py | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 20c9872..dca9901 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -47,6 +47,7 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Dirk Baechle: - Update XML doc editor configuration + - Fix: Allow varlist to be specified as list of strings for Actions (#2754) From Rob Managan: - Updated the TeX builder to support use of the -synctex=1 diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 16866b6..1c746be 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -337,7 +337,7 @@ def _do_create_keywords(args, kw): 'You must either pass a string or a callback which ' 'accepts (target, source, env) as parameters.') if len(args) > 1: - kw['varlist'] = args[1:] + kw['varlist'] + kw['varlist'] = tuple(SCons.Util.flatten(args[1:])) + kw['varlist'] if kw.get('strfunction', _null) is not _null \ and kw.get('cmdstr', _null) is not _null: raise SCons.Errors.UserError( diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 809e5ce..b46347d 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -211,6 +211,9 @@ def test_varlist(pos_call, str_call, cmd, cmdstrfunc, **kw): a = call_action((cmd, cmdstrfunc, 'a', 'b', 'c')) assert a.varlist == ('a', 'b', 'c'), a.varlist + a = call_action((cmd, cmdstrfunc, ['a', 'b', 'c'])) + assert a.varlist == ('a', 'b', 'c'), a.varlist + kw['varlist'] = 'foo' a = call_action((cmd, cmdstrfunc)) assert a.varlist == ('foo',), a.varlist -- cgit v0.12