diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 12:01:29 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 12:01:29 +0000 |
| commit | 4de39f87c85a89046e2bbead1ddd4d6c85e1278c (patch) | |
| tree | 41c862a438f14947f760c92edc9a70d0aa7215ce /chrome_frame | |
| parent | fb3e985829bde90a71134801d773ad8e1407dda1 (diff) | |
| download | chromium_src-4de39f87c85a89046e2bbead1ddd4d6c85e1278c.zip chromium_src-4de39f87c85a89046e2bbead1ddd4d6c85e1278c.tar.gz chromium_src-4de39f87c85a89046e2bbead1ddd4d6c85e1278c.tar.bz2 | |
Standardize grit invokes
- Add two gypi files to src/build for the boilerplate added to targets and actions
- Update grit_info to also support the -E flag so it can share more of the grit build commandline
- switch over all but the webkit and webkit glue grd files to use the common support
BUG=22247
TEST=everything still localized correctly
Review URL: http://codereview.chromium.org/6705030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 9449d60..a6c57fa 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -691,41 +691,19 @@ { 'target_name': 'chrome_frame_strings', 'type': 'none', - 'rules': [ + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', + }, + 'actions': [ { - 'rule_name': 'grit', - 'extension': 'grd', - 'inputs': [ - '../tools/grit/grit.py', - ], + 'action_name': 'chrome_frame_resources', 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', + 'grit_grd_file': 'resources/chrome_frame_resources.grd', }, - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/grit/<(RULE_INPUT_ROOT).h', - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/<(RULE_INPUT_ROOT).pak', - ], - 'action': ['python', '<@(_inputs)', '-i', - '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)' - ], - 'message': 'Generating resources from <(RULE_INPUT_PATH)', + 'includes': [ '../build/grit_action.gypi' ], }, ], - 'sources': [ - # Localizable resources. - 'resources/chrome_frame_resources.grd', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', - ], - }, - 'conditions': [ - ['OS=="win"', { - 'dependencies': ['../build/win/system.gyp:cygwin'], - }], - ], + 'includes': [ '../build/grit_target.gypi' ], }, { 'target_name': 'chrome_frame_utils', |