Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: tools/grit/grit/scons.py

Issue 28194: Fix grit include dependencies in the scons build. (Closed)
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | tools/grit/grit/tool/build.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/scons.py
diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py
index 9a882161d3b0666ef75d6882f6db610a425e7bbc..849e5379dd8befb50c690411888bee410489fb66 100644
--- a/tools/grit/grit/scons.py
+++ b/tools/grit/grit/scons.py
@@ -138,17 +138,16 @@ def _Scanner(file_node, env, path):
# 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())
+ grd = grd_reader.Parse(os.path.abspath(_SourceToFile(file_node)),
+ debug=_IsDebugEnabled())
files = []
for node in grd:
if (node.name == 'structure' or node.name == 'skeleton' or
(node.name == 'file' and node.parent and
node.parent.name == 'translations')):
files.append(os.path.abspath(node.GetFilePath()))
- elif node.name == 'include' and node.attrs['filenameonly'] == 'false':
- # TODO(tc): This doesn't work because the path is often relative to
- #files.append(node.FilenameToOpen())
- pass
+ elif node.name == 'include':
+ files.append(node.FilenameToOpen())
# Add in the grit source files. If one of these change, we want to re-run
# grit.
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | tools/grit/grit/tool/build.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698