diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 00:12:18 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 00:12:18 +0000 |
| commit | 85535e8119342746d69dac2701c5b7379fbf3a4d (patch) | |
| tree | c320f1fa9d8a3d559b057120270bf21aa4497d53 /app/app.gyp | |
| parent | 8582b16142aee838ff892cf43ab9da7c413d310f (diff) | |
| download | chromium_src-85535e8119342746d69dac2701c5b7379fbf3a4d.zip chromium_src-85535e8119342746d69dac2701c5b7379fbf3a4d.tar.gz chromium_src-85535e8119342746d69dac2701c5b7379fbf3a4d.tar.bz2 | |
Add locale_settings file to app_strings target.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/112038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app.gyp')
| -rw-r--r-- | app/app.gyp | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/app/app.gyp b/app/app.gyp index 7767416..4a4c29b 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -122,13 +122,6 @@ ], }], ['OS=="win"', { - # TODO: remove this when chrome_resources/chrome_strings are - # generated by GYP. - # The legacy vcproj we rely on places the grit output in this - # directory, so we need to explicitly add it to our include path. - 'include_dirs': [ - '<(PRODUCT_DIR)/grit_derived_sources', - ], 'sources': [ 'win_util.cc', 'win_util.h', @@ -203,30 +196,32 @@ }, { 'target_name': 'app_strings', - 'type': 'none', 'msvs_guid': 'AE9BF4A2-19C5-49D8-BB1A-F28496DD7051', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', - }, - 'actions': [ + 'type': 'none', + 'rules': [ { - 'action_name': 'app_strings', - 'variables': { - 'input_path': 'resources/app_strings.grd', - }, + 'rule_name': 'grit', + 'extension': 'grd', 'inputs': [ - '<(input_path)', + '../tools/grit/grit.py', ], + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + }, 'outputs': [ - '<(grit_out_dir)/grit/app_strings.h', - '<(grit_out_dir)/app_strings_en-US.pak', - '<(grit_out_dir)/app_strings_en-US.rc', + '<(SHARED_INTERMEDIATE_DIR)/app/grit/<(RULE_INPUT_ROOT).h', + '<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_en-US.pak', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], - 'message': 'Generating resources from <(input_path)', + 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', + 'build', '-o', '<(grit_out_dir)'], + 'message': 'Generating resources from <(RULE_INPUT_PATH)', }, ], + 'sources': [ + # Localizable resources. + 'resources/app_locale_settings.grd', + 'resources/app_strings.grd', + ], 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/app', |