diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 04:49:53 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 04:49:53 +0000 |
commit | 367a758fff63fe033045551915770969dd54e035 (patch) | |
tree | 4ed0bf1ba4c05df654afe519e833c2a54a935144 /app | |
parent | ea832f7c6f6760c95e1029196f34f355ff69b38e (diff) | |
download | chromium_src-367a758fff63fe033045551915770969dd54e035.zip chromium_src-367a758fff63fe033045551915770969dd54e035.tar.gz chromium_src-367a758fff63fe033045551915770969dd54e035.tar.bz2 |
Changing the grd files in chrome/webkit/app to be compiled to seprate
directories to prevent them from stomping each other when they have names that
are the same.
Also adding some dependencies on theme_resources, webkit_resources,
that were missing, but undetected due to everyone sharing the same output
directory.
BUG=22385
TEST=None
Review URL: http://codereview.chromium.org/208056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r-- | app/app.gyp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/app/app.gyp b/app/app.gyp index 18edb94..0f727ca 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -7,6 +7,13 @@ # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], 'chromium_code': 1, + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py',], + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + 'grit_cmd': ['python', '../tools/grit/grit.py'], + 'localizable_resources': [ + 'resources/app_locale_settings.grd', + 'resources/app_strings.grd', + ], }, 'target_defaults': { 'sources/': [ @@ -241,18 +248,15 @@ 'rule_name': 'grit', 'extension': 'grd', 'inputs': [ - '../tools/grit/grit.py', + '<!@(<(grit_info_cmd) --inputs <(localizable_resources))', ], - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', - }, 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/app/grit/<(RULE_INPUT_ROOT).h', + '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', + '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', ], - 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)'], + 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', + 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)'], 'message': 'Generating resources from <(RULE_INPUT_PATH)', 'conditions': [ ['use_titlecase_in_grd_files==1', { @@ -262,13 +266,12 @@ }, ], 'sources': [ - # Localizable resources. - 'resources/app_locale_settings.grd', - 'resources/app_strings.grd', + '<@(localizable_resources)', ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/app', + '<(grit_out_dir)/app_locale_settings', + '<(grit_out_dir)/app_strings', ], }, 'conditions': [ @@ -281,10 +284,6 @@ 'target_name': 'app_resources', 'type': 'none', 'msvs_guid': '3FBC4235-3FBD-46DF-AEDC-BADBBA13A095', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', - }, 'actions': [ { 'action_name': 'app_resources', @@ -292,20 +291,20 @@ 'input_path': 'resources/app_resources.grd', }, 'inputs': [ - '<(input_path)', + '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<(grit_out_dir)/grit/app_resources.h', - '<(grit_out_dir)/app_resources.pak', - '<(grit_out_dir)/app_resources.rc', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/app_resources\' <(input_path))', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'action': ['<@(grit_cmd)', + '-i', '<(input_path)', 'build', + '-o', '<(grit_out_dir)/app_resources'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/app', + '<(grit_out_dir)/app_resources', ], }, 'conditions': [ @@ -319,7 +318,7 @@ 'type': 'none', 'msvs_guid': '83100055-172B-49EA-B422-B1A92B627D37', 'conditions': [ - ['OS=="win"', + ['OS=="win"', { 'actions': [ { @@ -332,7 +331,7 @@ 'variables': { 'appid_value': '<(google_update_appid)', }, - }, { # else + }, { # else 'variables': { 'appid_value': '', }, |