diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 00:59:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 00:59:35 +0000 |
| commit | bc4451ceed50867267e75b6677c945e39442e332 (patch) | |
| tree | 19708267599270dc64d3763695883610fb673518 /tools/grit | |
| parent | afeb8f17bae749928b280fb6a755f3e4696d91d7 (diff) | |
| download | chromium_src-bc4451ceed50867267e75b6677c945e39442e332.zip chromium_src-bc4451ceed50867267e75b6677c945e39442e332.tar.gz chromium_src-bc4451ceed50867267e75b6677c945e39442e332.tar.bz2 | |
Move webkit_resources.rc to webkit_resources.grd. Add
webkit_resources.vcproj which creates the .rc files and have webkit
glue depend on it.
I had to add a flag to grit that allows a resource to be in the
header, but not in the .rc file. We do this for a test_shell only
resource that is not compiled in.
SCons build also works on windows.
I still need to update the other .sln files and mac build.
Review URL: http://codereview.chromium.org/17466
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/grit/format/rc.py | 3 | ||||
| -rw-r--r-- | tools/grit/grit/node/include.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/grit/grit/format/rc.py b/tools/grit/grit/format/rc.py index 2da976a..1ce7772 100644 --- a/tools/grit/grit/format/rc.py +++ b/tools/grit/grit/format/rc.py @@ -405,6 +405,9 @@ class RcInclude(interface.ItemFormatter): def Format(self, item, lang='en', begin_item=True, output_dir='.'): if not begin_item: return '' + + if item.attrs['headeronly'] == 'true': + return '' assert isinstance(lang, types.StringTypes) from grit.node import structure diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py index 67a05ac..a62445b 100644 --- a/tools/grit/grit/node/include.py +++ b/tools/grit/grit/node/include.py @@ -27,6 +27,7 @@ class IncludeNode(base.Node): 'generateid': 'true', 'filenameonly': 'false', 'relativepath': 'false', + 'headeronly': 'false', } def ItemFormatter(self, t): |