diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 06:16:49 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 06:16:49 +0000 |
| commit | db701a4a4dd725457b4acd9a02dfc675519cc8ee (patch) | |
| tree | d8b843c21caf8a434b9a8b1dc96f72b661238b7b | |
| parent | 5debebddead6458cf92cfb4821d0a5a6887141b8 (diff) | |
| download | chromium_src-db701a4a4dd725457b4acd9a02dfc675519cc8ee.zip chromium_src-db701a4a4dd725457b4acd9a02dfc675519cc8ee.tar.gz chromium_src-db701a4a4dd725457b4acd9a02dfc675519cc8ee.tar.bz2 | |
Fixing up webkit_strings and webkit_resources to use grit scanner to decide
inputs and outputs. Also changing these to so that they don't collide as in
issue 22385.
BUG=22385
TEST=None
TBR=sgk
Review URL: http://codereview.chromium.org/217013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26798 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/webkit.gyp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 9c77a82..5447f60 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -9,6 +9,7 @@ 'variables': { # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py',], }, 'targets': [ { @@ -246,20 +247,18 @@ 'input_path': 'glue/webkit_resources.grd', }, 'inputs': [ - '<(input_path)', + '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<(grit_out_dir)/grit/webkit_resources.h', - '<(grit_out_dir)/webkit_resources.pak', - '<(grit_out_dir)/webkit_resources.rc', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_resources\' <(input_path))', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)/webkit_resources'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit', + '<(grit_out_dir)/webkit_resources', ], }, 'conditions': [ @@ -283,20 +282,18 @@ 'input_path': 'glue/webkit_strings.grd', }, 'inputs': [ - '<(input_path)', + '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<(grit_out_dir)/grit/webkit_strings.h', - # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/webkit_strings_ZZLOCALE.pak\' <(locales))', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_strings\' <(input_path))', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)/webkit_strings'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit', + '<(grit_out_dir)/webkit_strings', ], }, 'conditions': [ |