diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 02:26:30 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 02:26:30 +0000 |
| commit | 8322ac6958d1eed444e4f681d4f1ab6bfff4a3f9 (patch) | |
| tree | a3b17de69b2f15828c8da56bc4be36fd8182e109 /tools/grit | |
| parent | 279c4199ba7327239de927765e74c64a1b8779af (diff) | |
| download | chromium_src-8322ac6958d1eed444e4f681d4f1ab6bfff4a3f9.zip chromium_src-8322ac6958d1eed444e4f681d4f1ab6bfff4a3f9.tar.gz chromium_src-8322ac6958d1eed444e4f681d4f1ab6bfff4a3f9.tar.bz2 | |
Fixes for Visual Studio solution + project file generation:
* Fix the grit tool so it works with Repository() directories (and
tap gspencer to upstream the changes).
* Fix the evaluation of $PRE_EVALUATE_DIRS, which was interfering
with sucking up the source files for listing in the .vcproj files.
* Set AlwaysBuild() on the project files so they're always
evaluated for up-to-dateness when 'all_solutions' is the target.
Review URL: http://codereview.chromium.org/10725
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/grit/scons.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py index 12516b0..0bc759a 100644 --- a/tools/grit/grit/scons.py +++ b/tools/grit/grit/scons.py @@ -22,9 +22,17 @@ def _SourceToFile(source): # Get the filename of the source. The 'source' parameter can be a string, # a "node", or a list of strings or nodes. if isinstance(source, types.ListType): - source = str(source[0]) + # 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. + #source = str(source[0]) + source = str(source[0].rfile()) else: - source = str(source) + # 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. + #source = str(source)) + source = str(source.rfile()) return source @@ -65,7 +73,11 @@ def _Emitter(target, source, env): from grit import util from grit import grd_reader - base_dir = util.dirname(str(target[0])) + # TODO(gspencer): Had to use .abspath, not str(target[0]), to get + # this to work with Repository() directories. + # Get this functionality folded back into the upstream grit tool. + #base_dir = util.dirname(str(target[0])) + base_dir = util.dirname(target[0].abspath) grd = grd_reader.Parse(_SourceToFile(source), debug=_IsDebugEnabled()) |