diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 22:05:26 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 22:05:26 +0000 |
| commit | f730a913f16507bedeeca30827a66f07903fb42a (patch) | |
| tree | 669d021ae57cf76a3e822ce53061b7a312a1f613 /site_scons | |
| parent | e69bce3dd3e31039bc1072ae2aa63485d094ecd0 (diff) | |
| download | chromium_src-f730a913f16507bedeeca30827a66f07903fb42a.zip chromium_src-f730a913f16507bedeeca30827a66f07903fb42a.tar.gz chromium_src-f730a913f16507bedeeca30827a66f07903fb42a.tar.bz2 | |
When env.Replace() is getting called with a list of Nodes, use a slice to
replace the old list element with the new list. This keeps the list of
files flattened and lets the later Builder calls remove the file names
with non-linkable/non-compilable suffixes (.h) from the list.
Add .gperf to the list of non-{compil,link}able suffixes.
Review URL: http://codereview.chromium.org/89003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/site_tools/chromium_builders.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/site_scons/site_tools/chromium_builders.py b/site_scons/site_tools/chromium_builders.py index fb9deba..80f89ed 100644 --- a/site_scons/site_tools/chromium_builders.py +++ b/site_scons/site_tools/chromium_builders.py @@ -13,6 +13,7 @@ import sys from SCons.Script import * import SCons.Node +import SCons.Util class Null(object): def __new__(cls, *args, **kwargs): @@ -116,7 +117,10 @@ class ChromeFileList(FileList): except ValueError: pass else: - top[i] = new + if SCons.Util.is_List(new): + top[i:i+1] = new + else: + top[i] = new def FilterOut(self, **kw): @@ -158,6 +162,7 @@ non_compilable_suffixes = { '.bdic', '.css', '.dat', + '.gperf', '.h', '.html', '.hxx', |