diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
| commit | da6654b0465478b0549e593c1efb45bd44756965 (patch) | |
| tree | 487788278214089228f23098346c1d02b5acfec4 /tools | |
| parent | 1fbb43878f7f68c1770a12847ecd46c0f1413b3e (diff) | |
| download | chromium_src-da6654b0465478b0549e593c1efb45bd44756965.zip chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.gz chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.bz2 | |
Next round of SCons changes:
* Add 'gdm_fp' to the $LIBS setting in base\using_base.scons
(to be removed when that library moves into base\third_party).
* Have the grit Scanner search the Repository() copy of the source
file (necessary now that $TARGET_ROOT has changed).
* Change all the SConscript files underneath chrome\test and
chrome\tools to *.scons files, including updating their
contents with the current patterns.
* Add dependencies of the local_settings_*.res files on
the corresponding google_chrome_string_*.rc files, so they
get generated properly.
* Add generation of the chrome_exe.res resource file.
* Comment out some unnecessary .lib settings in the base
construction environment.
Review URL: http://codereview.chromium.org/10745
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/grit/grit/scons.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py index 0bc759a..d0ac231 100644 --- a/tools/grit/grit/scons.py +++ b/tools/grit/grit/scons.py @@ -117,7 +117,11 @@ def _Scanner(file_node, env, path): ''' from grit import grd_reader - grd = grd_reader.Parse(str(file_node), debug=_IsDebugEnabled()) + # TODO(gspencer): Had to add the .rfile() method to the following + # line to get this to work with Repository() directories. + # Get this functionality folded back into the upstream grit tool. + #grd = grd_reader.Parse(str(file_node)), debug=_IsDebugEnabled()) + grd = grd_reader.Parse(str(file_node.rfile()), debug=_IsDebugEnabled()) files = [] for node in grd: if (node.name == 'structure' or node.name == 'skeleton' or |