diff options
| -rw-r--r-- | app/app.gyp | 47 | ||||
| -rw-r--r-- | chrome/app/locales/locales.gyp | 608 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 56 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 1 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 35 |
5 files changed, 369 insertions, 378 deletions
diff --git a/app/app.gyp b/app/app.gyp index 0f727ca..18edb94 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -7,13 +7,6 @@ # 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/': [ @@ -248,15 +241,18 @@ 'rule_name': 'grit', 'extension': 'grd', 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(localizable_resources))', + '../tools/grit/grit.py', ], + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + }, 'outputs': [ - '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', + '<(SHARED_INTERMEDIATE_DIR)/app/grit/<(RULE_INPUT_ROOT).h', # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', + '>!@(<(apply_locales_cmd) \'<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', ], - 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)'], + 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', + 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(RULE_INPUT_PATH)', 'conditions': [ ['use_titlecase_in_grd_files==1', { @@ -266,12 +262,13 @@ }, ], 'sources': [ - '<@(localizable_resources)', + # Localizable resources. + 'resources/app_locale_settings.grd', + 'resources/app_strings.grd', ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/app_locale_settings', - '<(grit_out_dir)/app_strings', + '<(SHARED_INTERMEDIATE_DIR)/app', ], }, 'conditions': [ @@ -284,6 +281,10 @@ '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', @@ -291,20 +292,20 @@ 'input_path': 'resources/app_resources.grd', }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(input_path))', + '<(input_path)', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/app_resources\' <(input_path))', + '<(grit_out_dir)/grit/app_resources.h', + '<(grit_out_dir)/app_resources.pak', + '<(grit_out_dir)/app_resources.rc', ], - 'action': ['<@(grit_cmd)', - '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/app_resources'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/app_resources', + '<(SHARED_INTERMEDIATE_DIR)/app', ], }, 'conditions': [ @@ -318,7 +319,7 @@ 'type': 'none', 'msvs_guid': '83100055-172B-49EA-B422-B1A92B627D37', 'conditions': [ - ['OS=="win"', + ['OS=="win"', { 'actions': [ { @@ -331,7 +332,7 @@ 'variables': { 'appid_value': '<(google_update_appid)', }, - }, { # else + }, { # else 'variables': { 'appid_value': '', }, diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index 44c4685..b2406b7 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -1,15 +1,9 @@ { 'variables': { 'chromium_code': 1, - 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', - 'generated_resources_dir': '<(chrome_grit_out_dir)/generated_resources', - 'locale_settings_dir': '<(chrome_grit_out_dir)/locale_settings', - 'chrome_strings_dir': '<(chrome_grit_out_dir)/chrome_strings', - 'webkit_strings_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings', 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', - 'app_strings_dir': '<(app_grit_out_dir)/app_strings', - 'app_locale_settings_dir': '<(app_grit_out_dir)/app_locale_settings', + 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', # TODO(sgk): eliminate this; see comment in build/common.gypi 'msvs_debug_link_incremental': '1', @@ -45,600 +39,600 @@ 'target_name': 'ar', 'msvs_guid': '3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8', 'sources': [ - '<(generated_resources_dir)/generated_resources_ar.rc', - '<(locale_settings_dir)/locale_settings_ar.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ar.rc', - '<(webkit_strings_dir)/webkit_strings_ar.rc', - '<(app_strings_dir)/app_strings_ar.rc', - '<(app_locale_settings_dir)/app_locale_settings_ar.rc', + '<(chrome_grit_out_dir)/generated_resources_ar.rc', + '<(chrome_grit_out_dir)/locale_settings_ar.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ar.rc', + '<(webkit_grit_out_dir)/webkit_strings_ar.rc', + '<(app_grit_out_dir)/app_strings_ar.rc', + '<(app_grit_out_dir)/app_locale_settings_ar.rc', ], }, { 'target_name': 'bg', 'msvs_guid': '5BDB7EE1-A1FD-410C-9598-21519A1B7952', 'sources': [ - '<(generated_resources_dir)/generated_resources_bg.rc', - '<(locale_settings_dir)/locale_settings_bg.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_bg.rc', - '<(webkit_strings_dir)/webkit_strings_bg.rc', - '<(app_strings_dir)/app_strings_bg.rc', - '<(app_locale_settings_dir)/app_locale_settings_bg.rc', + '<(chrome_grit_out_dir)/generated_resources_bg.rc', + '<(chrome_grit_out_dir)/locale_settings_bg.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_bg.rc', + '<(webkit_grit_out_dir)/webkit_strings_bg.rc', + '<(app_grit_out_dir)/app_strings_bg.rc', + '<(app_grit_out_dir)/app_locale_settings_bg.rc', ], }, { 'target_name': 'bn', 'msvs_guid': '4B60E8B8-416F-40B2-8A54-F75970A21992', 'sources': [ - '<(generated_resources_dir)/generated_resources_bn.rc', - '<(locale_settings_dir)/locale_settings_bn.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_bn.rc', - '<(webkit_strings_dir)/webkit_strings_bn.rc', - '<(app_strings_dir)/app_strings_bn.rc', - '<(app_locale_settings_dir)/app_locale_settings_bn.rc', + '<(chrome_grit_out_dir)/generated_resources_bn.rc', + '<(chrome_grit_out_dir)/locale_settings_bn.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_bn.rc', + '<(webkit_grit_out_dir)/webkit_strings_bn.rc', + '<(app_grit_out_dir)/app_strings_bn.rc', + '<(app_grit_out_dir)/app_locale_settings_bn.rc', ], }, { 'target_name': 'ca', 'msvs_guid': 'F7790A54-4078-4E4A-8231-818BE9FB1F94', 'sources': [ - '<(generated_resources_dir)/generated_resources_ca.rc', - '<(locale_settings_dir)/locale_settings_ca.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ca.rc', - '<(webkit_strings_dir)/webkit_strings_ca.rc', - '<(app_strings_dir)/app_strings_ca.rc', - '<(app_locale_settings_dir)/app_locale_settings_ca.rc', + '<(chrome_grit_out_dir)/generated_resources_ca.rc', + '<(chrome_grit_out_dir)/locale_settings_ca.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ca.rc', + '<(webkit_grit_out_dir)/webkit_strings_ca.rc', + '<(app_grit_out_dir)/app_strings_ca.rc', + '<(app_grit_out_dir)/app_locale_settings_ca.rc', ], }, { 'target_name': 'cs', 'msvs_guid': '7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2', 'sources': [ - '<(generated_resources_dir)/generated_resources_cs.rc', - '<(locale_settings_dir)/locale_settings_cs.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_cs.rc', - '<(webkit_strings_dir)/webkit_strings_cs.rc', - '<(app_strings_dir)/app_strings_cs.rc', - '<(app_locale_settings_dir)/app_locale_settings_cs.rc', + '<(chrome_grit_out_dir)/generated_resources_cs.rc', + '<(chrome_grit_out_dir)/locale_settings_cs.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_cs.rc', + '<(webkit_grit_out_dir)/webkit_strings_cs.rc', + '<(app_grit_out_dir)/app_strings_cs.rc', + '<(app_grit_out_dir)/app_locale_settings_cs.rc', ], }, { 'target_name': 'da', 'msvs_guid': 'A493331B-3180-49FE-8D0E-D121645E63AD', 'sources': [ - '<(generated_resources_dir)/generated_resources_da.rc', - '<(locale_settings_dir)/locale_settings_da.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_da.rc', - '<(webkit_strings_dir)/webkit_strings_da.rc', - '<(app_strings_dir)/app_strings_da.rc', - '<(app_locale_settings_dir)/app_locale_settings_da.rc', + '<(chrome_grit_out_dir)/generated_resources_da.rc', + '<(chrome_grit_out_dir)/locale_settings_da.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_da.rc', + '<(webkit_grit_out_dir)/webkit_strings_da.rc', + '<(app_grit_out_dir)/app_strings_da.rc', + '<(app_grit_out_dir)/app_locale_settings_da.rc', ], }, { 'target_name': 'de', 'msvs_guid': 'BA62FF5E-08A6-4102-9675-C12E8C9D4CC0', 'sources': [ - '<(generated_resources_dir)/generated_resources_de.rc', - '<(locale_settings_dir)/locale_settings_de.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_de.rc', - '<(webkit_strings_dir)/webkit_strings_de.rc', - '<(app_strings_dir)/app_strings_de.rc', - '<(app_locale_settings_dir)/app_locale_settings_de.rc', + '<(chrome_grit_out_dir)/generated_resources_de.rc', + '<(chrome_grit_out_dir)/locale_settings_de.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_de.rc', + '<(webkit_grit_out_dir)/webkit_strings_de.rc', + '<(app_grit_out_dir)/app_strings_de.rc', + '<(app_grit_out_dir)/app_locale_settings_de.rc', ], }, { 'target_name': 'el', 'msvs_guid': 'D314F1B3-9299-4866-8362-08BF811B0FA3', 'sources': [ - '<(generated_resources_dir)/generated_resources_el.rc', - '<(locale_settings_dir)/locale_settings_el.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_el.rc', - '<(webkit_strings_dir)/webkit_strings_el.rc', - '<(app_strings_dir)/app_strings_el.rc', - '<(app_locale_settings_dir)/app_locale_settings_el.rc', + '<(chrome_grit_out_dir)/generated_resources_el.rc', + '<(chrome_grit_out_dir)/locale_settings_el.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_el.rc', + '<(webkit_grit_out_dir)/webkit_strings_el.rc', + '<(app_grit_out_dir)/app_strings_el.rc', + '<(app_grit_out_dir)/app_locale_settings_el.rc', ], }, { 'target_name': 'en-GB', 'msvs_guid': '34231B28-C51C-4C1C-AF07-C763668B1404', 'sources': [ - '<(generated_resources_dir)/generated_resources_en-GB.rc', - '<(locale_settings_dir)/locale_settings_en-GB.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_en-GB.rc', - '<(webkit_strings_dir)/webkit_strings_en-GB.rc', - '<(app_strings_dir)/app_strings_en-GB.rc', - '<(app_locale_settings_dir)/app_locale_settings_en-GB.rc', + '<(chrome_grit_out_dir)/generated_resources_en-GB.rc', + '<(chrome_grit_out_dir)/locale_settings_en-GB.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_en-GB.rc', + '<(webkit_grit_out_dir)/webkit_strings_en-GB.rc', + '<(app_grit_out_dir)/app_strings_en-GB.rc', + '<(app_grit_out_dir)/app_locale_settings_en-GB.rc', ], }, { 'target_name': 'en-US', 'msvs_guid': 'CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3', 'sources': [ - '<(generated_resources_dir)/generated_resources_en-US.rc', - '<(locale_settings_dir)/locale_settings_en-US.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_en-US.rc', - '<(webkit_strings_dir)/webkit_strings_en-US.rc', - '<(app_strings_dir)/app_strings_en-US.rc', - '<(app_locale_settings_dir)/app_locale_settings_en-US.rc', + '<(chrome_grit_out_dir)/generated_resources_en-US.rc', + '<(chrome_grit_out_dir)/locale_settings_en-US.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_en-US.rc', + '<(webkit_grit_out_dir)/webkit_strings_en-US.rc', + '<(app_grit_out_dir)/app_strings_en-US.rc', + '<(app_grit_out_dir)/app_locale_settings_en-US.rc', ], }, { 'target_name': 'es-419', 'msvs_guid': 'FA660037-EB40-4A43-AA9D-9653C57F2789', 'sources': [ - '<(generated_resources_dir)/generated_resources_es-419.rc', - '<(locale_settings_dir)/locale_settings_es-419.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_es-419.rc', - '<(webkit_strings_dir)/webkit_strings_es-419.rc', - '<(app_strings_dir)/app_strings_es-419.rc', - '<(app_locale_settings_dir)/app_locale_settings_es-419.rc', + '<(chrome_grit_out_dir)/generated_resources_es-419.rc', + '<(chrome_grit_out_dir)/locale_settings_es-419.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_es-419.rc', + '<(webkit_grit_out_dir)/webkit_strings_es-419.rc', + '<(app_grit_out_dir)/app_strings_es-419.rc', + '<(app_grit_out_dir)/app_locale_settings_es-419.rc', ], }, { 'target_name': 'es', 'msvs_guid': '5AEA4BF6-27CD-47FC-9370-D87771CFA196', 'sources': [ - '<(generated_resources_dir)/generated_resources_es.rc', - '<(locale_settings_dir)/locale_settings_es.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_es.rc', - '<(webkit_strings_dir)/webkit_strings_es.rc', - '<(app_strings_dir)/app_strings_es.rc', - '<(app_locale_settings_dir)/app_locale_settings_es.rc', + '<(chrome_grit_out_dir)/generated_resources_es.rc', + '<(chrome_grit_out_dir)/locale_settings_es.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_es.rc', + '<(webkit_grit_out_dir)/webkit_strings_es.rc', + '<(app_grit_out_dir)/app_strings_es.rc', + '<(app_grit_out_dir)/app_locale_settings_es.rc', ], }, { 'target_name': 'et', 'msvs_guid': '0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4', 'sources': [ - '<(generated_resources_dir)/generated_resources_et.rc', - '<(locale_settings_dir)/locale_settings_et.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_et.rc', - '<(webkit_strings_dir)/webkit_strings_et.rc', - '<(app_strings_dir)/app_strings_et.rc', - '<(app_locale_settings_dir)/app_locale_settings_et.rc', + '<(chrome_grit_out_dir)/generated_resources_et.rc', + '<(chrome_grit_out_dir)/locale_settings_et.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_et.rc', + '<(webkit_grit_out_dir)/webkit_strings_et.rc', + '<(app_grit_out_dir)/app_strings_et.rc', + '<(app_grit_out_dir)/app_locale_settings_et.rc', ], }, { 'target_name': 'fi', 'msvs_guid': '64D81334-DE73-457D-8FC1-9492508A2663', 'sources': [ - '<(generated_resources_dir)/generated_resources_fi.rc', - '<(locale_settings_dir)/locale_settings_fi.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_fi.rc', - '<(webkit_strings_dir)/webkit_strings_fi.rc', - '<(app_strings_dir)/app_strings_fi.rc', - '<(app_locale_settings_dir)/app_locale_settings_fi.rc', + '<(chrome_grit_out_dir)/generated_resources_fi.rc', + '<(chrome_grit_out_dir)/locale_settings_fi.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_fi.rc', + '<(webkit_grit_out_dir)/webkit_strings_fi.rc', + '<(app_grit_out_dir)/app_strings_fi.rc', + '<(app_grit_out_dir)/app_locale_settings_fi.rc', ], }, { 'target_name': 'fil', 'msvs_guid': '3A932C39-AFA9-4BDC-B775-F71A426D04BF', 'sources': [ - '<(generated_resources_dir)/generated_resources_fil.rc', - '<(locale_settings_dir)/locale_settings_fil.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_fil.rc', - '<(webkit_strings_dir)/webkit_strings_fil.rc', - '<(app_strings_dir)/app_strings_fil.rc', - '<(app_locale_settings_dir)/app_locale_settings_fil.rc', + '<(chrome_grit_out_dir)/generated_resources_fil.rc', + '<(chrome_grit_out_dir)/locale_settings_fil.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_fil.rc', + '<(webkit_grit_out_dir)/webkit_strings_fil.rc', + '<(app_grit_out_dir)/app_strings_fil.rc', + '<(app_grit_out_dir)/app_locale_settings_fil.rc', ], }, { 'target_name': 'fr', 'msvs_guid': '0D54A5C4-B78B-41A2-BF8A-5DA48AC90495', 'sources': [ - '<(generated_resources_dir)/generated_resources_fr.rc', - '<(locale_settings_dir)/locale_settings_fr.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_fr.rc', - '<(webkit_strings_dir)/webkit_strings_fr.rc', - '<(app_strings_dir)/app_strings_fr.rc', - '<(app_locale_settings_dir)/app_locale_settings_fr.rc', + '<(chrome_grit_out_dir)/generated_resources_fr.rc', + '<(chrome_grit_out_dir)/locale_settings_fr.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_fr.rc', + '<(webkit_grit_out_dir)/webkit_strings_fr.rc', + '<(app_grit_out_dir)/app_strings_fr.rc', + '<(app_grit_out_dir)/app_locale_settings_fr.rc', ], }, { 'target_name': 'gu', 'msvs_guid': '256DECCE-9886-4C21-96A5-EE47DF5E07E9', 'sources': [ - '<(generated_resources_dir)/generated_resources_gu.rc', - '<(locale_settings_dir)/locale_settings_gu.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_gu.rc', - '<(webkit_strings_dir)/webkit_strings_gu.rc', - '<(app_strings_dir)/app_strings_gu.rc', - '<(app_locale_settings_dir)/app_locale_settings_gu.rc', + '<(chrome_grit_out_dir)/generated_resources_gu.rc', + '<(chrome_grit_out_dir)/locale_settings_gu.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_gu.rc', + '<(webkit_grit_out_dir)/webkit_strings_gu.rc', + '<(app_grit_out_dir)/app_strings_gu.rc', + '<(app_grit_out_dir)/app_locale_settings_gu.rc', ], }, { 'target_name': 'he', 'msvs_guid': 'A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4', 'sources': [ - '<(generated_resources_dir)/generated_resources_he.rc', - '<(locale_settings_dir)/locale_settings_he.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_he.rc', - '<(webkit_strings_dir)/webkit_strings_he.rc', - '<(app_strings_dir)/app_strings_he.rc', - '<(app_locale_settings_dir)/app_locale_settings_he.rc', + '<(chrome_grit_out_dir)/generated_resources_he.rc', + '<(chrome_grit_out_dir)/locale_settings_he.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_he.rc', + '<(webkit_grit_out_dir)/webkit_strings_he.rc', + '<(app_grit_out_dir)/app_strings_he.rc', + '<(app_grit_out_dir)/app_locale_settings_he.rc', ], }, { 'target_name': 'hi', 'msvs_guid': '228DD844-9926-420E-B193-6973BF2A4D0B', 'sources': [ - '<(generated_resources_dir)/generated_resources_hi.rc', - '<(locale_settings_dir)/locale_settings_hi.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_hi.rc', - '<(webkit_strings_dir)/webkit_strings_hi.rc', - '<(app_strings_dir)/app_strings_hi.rc', - '<(app_locale_settings_dir)/app_locale_settings_hi.rc', + '<(chrome_grit_out_dir)/generated_resources_hi.rc', + '<(chrome_grit_out_dir)/locale_settings_hi.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_hi.rc', + '<(webkit_grit_out_dir)/webkit_strings_hi.rc', + '<(app_grit_out_dir)/app_strings_hi.rc', + '<(app_grit_out_dir)/app_locale_settings_hi.rc', ], }, { 'target_name': 'hr', 'msvs_guid': 'CE1426F6-7D2B-4574-9929-58387BF7B05F', 'sources': [ - '<(generated_resources_dir)/generated_resources_hr.rc', - '<(locale_settings_dir)/locale_settings_hr.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_hr.rc', - '<(webkit_strings_dir)/webkit_strings_hr.rc', - '<(app_strings_dir)/app_strings_hr.rc', - '<(app_locale_settings_dir)/app_locale_settings_hr.rc', + '<(chrome_grit_out_dir)/generated_resources_hr.rc', + '<(chrome_grit_out_dir)/locale_settings_hr.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_hr.rc', + '<(webkit_grit_out_dir)/webkit_strings_hr.rc', + '<(app_grit_out_dir)/app_strings_hr.rc', + '<(app_grit_out_dir)/app_locale_settings_hr.rc', ], }, { 'target_name': 'hu', 'msvs_guid': 'AFF332BF-AF3D-4D35-86FC-42A727F01D36', 'sources': [ - '<(generated_resources_dir)/generated_resources_hu.rc', - '<(locale_settings_dir)/locale_settings_hu.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_hu.rc', - '<(webkit_strings_dir)/webkit_strings_hu.rc', - '<(app_strings_dir)/app_strings_hu.rc', - '<(app_locale_settings_dir)/app_locale_settings_hu.rc', + '<(chrome_grit_out_dir)/generated_resources_hu.rc', + '<(chrome_grit_out_dir)/locale_settings_hu.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_hu.rc', + '<(webkit_grit_out_dir)/webkit_strings_hu.rc', + '<(app_grit_out_dir)/app_strings_hu.rc', + '<(app_grit_out_dir)/app_locale_settings_hu.rc', ], }, { 'target_name': 'id', 'msvs_guid': 'E3DF045F-2174-4685-9CF7-0630A79F324B', 'sources': [ - '<(generated_resources_dir)/generated_resources_id.rc', - '<(locale_settings_dir)/locale_settings_id.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_id.rc', - '<(webkit_strings_dir)/webkit_strings_id.rc', - '<(app_strings_dir)/app_strings_id.rc', - '<(app_locale_settings_dir)/app_locale_settings_id.rc', + '<(chrome_grit_out_dir)/generated_resources_id.rc', + '<(chrome_grit_out_dir)/locale_settings_id.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_id.rc', + '<(webkit_grit_out_dir)/webkit_strings_id.rc', + '<(app_grit_out_dir)/app_strings_id.rc', + '<(app_grit_out_dir)/app_locale_settings_id.rc', ], }, { 'target_name': 'it', 'msvs_guid': '275F2993-EE9B-4E00-9C85-10A182FD423A', 'sources': [ - '<(generated_resources_dir)/generated_resources_it.rc', - '<(locale_settings_dir)/locale_settings_it.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_it.rc', - '<(webkit_strings_dir)/webkit_strings_it.rc', - '<(app_strings_dir)/app_strings_it.rc', - '<(app_locale_settings_dir)/app_locale_settings_it.rc', + '<(chrome_grit_out_dir)/generated_resources_it.rc', + '<(chrome_grit_out_dir)/locale_settings_it.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_it.rc', + '<(webkit_grit_out_dir)/webkit_strings_it.rc', + '<(app_grit_out_dir)/app_strings_it.rc', + '<(app_grit_out_dir)/app_locale_settings_it.rc', ], }, { 'target_name': 'ja', 'msvs_guid': 'B2D715CE-4CBB-415A-A032-E700C90ADF91', 'sources': [ - '<(generated_resources_dir)/generated_resources_ja.rc', - '<(locale_settings_dir)/locale_settings_ja.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ja.rc', - '<(webkit_strings_dir)/webkit_strings_ja.rc', - '<(app_strings_dir)/app_strings_ja.rc', - '<(app_locale_settings_dir)/app_locale_settings_ja.rc', + '<(chrome_grit_out_dir)/generated_resources_ja.rc', + '<(chrome_grit_out_dir)/locale_settings_ja.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ja.rc', + '<(webkit_grit_out_dir)/webkit_strings_ja.rc', + '<(app_grit_out_dir)/app_strings_ja.rc', + '<(app_grit_out_dir)/app_locale_settings_ja.rc', ], }, { 'target_name': 'kn', 'msvs_guid': '3E6B24F6-9FA9-4066-859E-BF747FA3080A', 'sources': [ - '<(generated_resources_dir)/generated_resources_kn.rc', - '<(locale_settings_dir)/locale_settings_kn.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_kn.rc', - '<(webkit_strings_dir)/webkit_strings_kn.rc', - '<(app_strings_dir)/app_strings_kn.rc', - '<(app_locale_settings_dir)/app_locale_settings_kn.rc', + '<(chrome_grit_out_dir)/generated_resources_kn.rc', + '<(chrome_grit_out_dir)/locale_settings_kn.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_kn.rc', + '<(webkit_grit_out_dir)/webkit_strings_kn.rc', + '<(app_grit_out_dir)/app_strings_kn.rc', + '<(app_grit_out_dir)/app_locale_settings_kn.rc', ], }, { 'target_name': 'ko', 'msvs_guid': '32167995-4014-4E4C-983B-F7E17C24EB25', 'sources': [ - '<(generated_resources_dir)/generated_resources_ko.rc', - '<(locale_settings_dir)/locale_settings_ko.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ko.rc', - '<(webkit_strings_dir)/webkit_strings_ko.rc', - '<(app_strings_dir)/app_strings_ko.rc', - '<(app_locale_settings_dir)/app_locale_settings_ko.rc', + '<(chrome_grit_out_dir)/generated_resources_ko.rc', + '<(chrome_grit_out_dir)/locale_settings_ko.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ko.rc', + '<(webkit_grit_out_dir)/webkit_strings_ko.rc', + '<(app_grit_out_dir)/app_strings_ko.rc', + '<(app_grit_out_dir)/app_locale_settings_ko.rc', ], }, { 'target_name': 'lt', 'msvs_guid': '80E37CB5-059D-4F4B-AEF6-08265468D368', 'sources': [ - '<(generated_resources_dir)/generated_resources_lt.rc', - '<(locale_settings_dir)/locale_settings_lt.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_lt.rc', - '<(webkit_strings_dir)/webkit_strings_lt.rc', - '<(app_strings_dir)/app_strings_lt.rc', - '<(app_locale_settings_dir)/app_locale_settings_lt.rc', + '<(chrome_grit_out_dir)/generated_resources_lt.rc', + '<(chrome_grit_out_dir)/locale_settings_lt.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_lt.rc', + '<(webkit_grit_out_dir)/webkit_strings_lt.rc', + '<(app_grit_out_dir)/app_strings_lt.rc', + '<(app_grit_out_dir)/app_locale_settings_lt.rc', ], }, { 'target_name': 'lv', 'msvs_guid': 'A5C5D801-4026-49F2-BBF1-250941855306', 'sources': [ - '<(generated_resources_dir)/generated_resources_lv.rc', - '<(locale_settings_dir)/locale_settings_lv.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_lv.rc', - '<(webkit_strings_dir)/webkit_strings_lv.rc', - '<(app_strings_dir)/app_strings_lv.rc', - '<(app_locale_settings_dir)/app_locale_settings_lv.rc', + '<(chrome_grit_out_dir)/generated_resources_lv.rc', + '<(chrome_grit_out_dir)/locale_settings_lv.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_lv.rc', + '<(webkit_grit_out_dir)/webkit_strings_lv.rc', + '<(app_grit_out_dir)/app_strings_lv.rc', + '<(app_grit_out_dir)/app_locale_settings_lv.rc', ], }, { 'target_name': 'ml', 'msvs_guid': 'CAB69303-0F02-4C68-A12E-FFE55DB52526', 'sources': [ - '<(generated_resources_dir)/generated_resources_ml.rc', - '<(locale_settings_dir)/locale_settings_ml.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ml.rc', - '<(webkit_strings_dir)/webkit_strings_ml.rc', - '<(app_strings_dir)/app_strings_ml.rc', - '<(app_locale_settings_dir)/app_locale_settings_ml.rc', + '<(chrome_grit_out_dir)/generated_resources_ml.rc', + '<(chrome_grit_out_dir)/locale_settings_ml.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ml.rc', + '<(webkit_grit_out_dir)/webkit_strings_ml.rc', + '<(app_grit_out_dir)/app_strings_ml.rc', + '<(app_grit_out_dir)/app_locale_settings_ml.rc', ], }, { 'target_name': 'mr', 'msvs_guid': 'A464166F-8507-49B4-9B02-5CB77C498B25', 'sources': [ - '<(generated_resources_dir)/generated_resources_mr.rc', - '<(locale_settings_dir)/locale_settings_mr.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_mr.rc', - '<(webkit_strings_dir)/webkit_strings_mr.rc', - '<(app_strings_dir)/app_strings_mr.rc', - '<(app_locale_settings_dir)/app_locale_settings_mr.rc', + '<(chrome_grit_out_dir)/generated_resources_mr.rc', + '<(chrome_grit_out_dir)/locale_settings_mr.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_mr.rc', + '<(webkit_grit_out_dir)/webkit_strings_mr.rc', + '<(app_grit_out_dir)/app_strings_mr.rc', + '<(app_grit_out_dir)/app_locale_settings_mr.rc', ], }, { 'target_name': 'nb', 'msvs_guid': 'B30B0E1F-1CE9-4DEF-A752-7498FD709C1F', 'sources': [ - '<(generated_resources_dir)/generated_resources_nb.rc', - '<(locale_settings_dir)/locale_settings_nb.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_nb.rc', - '<(webkit_strings_dir)/webkit_strings_nb.rc', - '<(app_strings_dir)/app_strings_nb.rc', - '<(app_locale_settings_dir)/app_locale_settings_nb.rc', + '<(chrome_grit_out_dir)/generated_resources_nb.rc', + '<(chrome_grit_out_dir)/locale_settings_nb.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_nb.rc', + '<(webkit_grit_out_dir)/webkit_strings_nb.rc', + '<(app_grit_out_dir)/app_strings_nb.rc', + '<(app_grit_out_dir)/app_locale_settings_nb.rc', ], }, { 'target_name': 'nl', 'msvs_guid': '63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8', 'sources': [ - '<(generated_resources_dir)/generated_resources_nl.rc', - '<(locale_settings_dir)/locale_settings_nl.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_nl.rc', - '<(webkit_strings_dir)/webkit_strings_nl.rc', - '<(app_strings_dir)/app_strings_nl.rc', - '<(app_locale_settings_dir)/app_locale_settings_nl.rc', + '<(chrome_grit_out_dir)/generated_resources_nl.rc', + '<(chrome_grit_out_dir)/locale_settings_nl.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_nl.rc', + '<(webkit_grit_out_dir)/webkit_strings_nl.rc', + '<(app_grit_out_dir)/app_strings_nl.rc', + '<(app_grit_out_dir)/app_locale_settings_nl.rc', ], }, { 'target_name': 'or', 'msvs_guid': 'E07D267C-34C3-4DDB-8B41-94697808714A', 'sources': [ - '<(generated_resources_dir)/generated_resources_or.rc', - '<(locale_settings_dir)/locale_settings_or.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_or.rc', - '<(webkit_strings_dir)/webkit_strings_or.rc', - '<(app_strings_dir)/app_strings_or.rc', - '<(app_locale_settings_dir)/app_locale_settings_or.rc', + '<(chrome_grit_out_dir)/generated_resources_or.rc', + '<(chrome_grit_out_dir)/locale_settings_or.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_or.rc', + '<(webkit_grit_out_dir)/webkit_strings_or.rc', + '<(app_grit_out_dir)/app_strings_or.rc', + '<(app_grit_out_dir)/app_locale_settings_or.rc', ], }, { 'target_name': 'pl', 'msvs_guid': '9F53807E-9382-47BD-8371-E5D04F517E9C', 'sources': [ - '<(generated_resources_dir)/generated_resources_pl.rc', - '<(locale_settings_dir)/locale_settings_pl.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_pl.rc', - '<(webkit_strings_dir)/webkit_strings_pl.rc', - '<(app_strings_dir)/app_strings_pl.rc', - '<(app_locale_settings_dir)/app_locale_settings_pl.rc', + '<(chrome_grit_out_dir)/generated_resources_pl.rc', + '<(chrome_grit_out_dir)/locale_settings_pl.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_pl.rc', + '<(webkit_grit_out_dir)/webkit_strings_pl.rc', + '<(app_grit_out_dir)/app_strings_pl.rc', + '<(app_grit_out_dir)/app_locale_settings_pl.rc', ], }, { 'target_name': 'pt-BR', 'msvs_guid': '2F914112-2657-49EC-8EA6-3BA63340DE27', 'sources': [ - '<(generated_resources_dir)/generated_resources_pt-BR.rc', - '<(locale_settings_dir)/locale_settings_pt-BR.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_pt-BR.rc', - '<(webkit_strings_dir)/webkit_strings_pt-BR.rc', - '<(app_strings_dir)/app_strings_pt-BR.rc', - '<(app_locale_settings_dir)/app_locale_settings_pt-BR.rc', + '<(chrome_grit_out_dir)/generated_resources_pt-BR.rc', + '<(chrome_grit_out_dir)/locale_settings_pt-BR.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_pt-BR.rc', + '<(webkit_grit_out_dir)/webkit_strings_pt-BR.rc', + '<(app_grit_out_dir)/app_strings_pt-BR.rc', + '<(app_grit_out_dir)/app_locale_settings_pt-BR.rc', ], }, { 'target_name': 'pt-PT', 'msvs_guid': '0A13F602-B497-4BC1-ABD8-03CA8E95B2AF', 'sources': [ - '<(generated_resources_dir)/generated_resources_pt-PT.rc', - '<(locale_settings_dir)/locale_settings_pt-PT.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_pt-PT.rc', - '<(webkit_strings_dir)/webkit_strings_pt-PT.rc', - '<(app_strings_dir)/app_strings_pt-PT.rc', - '<(app_locale_settings_dir)/app_locale_settings_pt-PT.rc', + '<(chrome_grit_out_dir)/generated_resources_pt-PT.rc', + '<(chrome_grit_out_dir)/locale_settings_pt-PT.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_pt-PT.rc', + '<(webkit_grit_out_dir)/webkit_strings_pt-PT.rc', + '<(app_grit_out_dir)/app_strings_pt-PT.rc', + '<(app_grit_out_dir)/app_locale_settings_pt-PT.rc', ], }, { 'target_name': 'ro', 'msvs_guid': 'C70D3509-57C4-4326-90C1-2EC0AE34848D', 'sources': [ - '<(generated_resources_dir)/generated_resources_ro.rc', - '<(locale_settings_dir)/locale_settings_ro.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ro.rc', - '<(webkit_strings_dir)/webkit_strings_ro.rc', - '<(app_strings_dir)/app_strings_ro.rc', - '<(app_locale_settings_dir)/app_locale_settings_ro.rc', + '<(chrome_grit_out_dir)/generated_resources_ro.rc', + '<(chrome_grit_out_dir)/locale_settings_ro.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ro.rc', + '<(webkit_grit_out_dir)/webkit_strings_ro.rc', + '<(app_grit_out_dir)/app_strings_ro.rc', + '<(app_grit_out_dir)/app_locale_settings_ro.rc', ], }, { 'target_name': 'ru', 'msvs_guid': '7D456640-3619-4D23-A56D-E0084400CCBF', 'sources': [ - '<(generated_resources_dir)/generated_resources_ru.rc', - '<(locale_settings_dir)/locale_settings_ru.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ru.rc', - '<(webkit_strings_dir)/webkit_strings_ru.rc', - '<(app_strings_dir)/app_strings_ru.rc', - '<(app_locale_settings_dir)/app_locale_settings_ru.rc', + '<(chrome_grit_out_dir)/generated_resources_ru.rc', + '<(chrome_grit_out_dir)/locale_settings_ru.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ru.rc', + '<(webkit_grit_out_dir)/webkit_strings_ru.rc', + '<(app_grit_out_dir)/app_strings_ru.rc', + '<(app_grit_out_dir)/app_locale_settings_ru.rc', ], }, { 'target_name': 'sk', 'msvs_guid': '82F5BFE5-FDCE-47D4-8B38-BEEBED561681', 'sources': [ - '<(generated_resources_dir)/generated_resources_sk.rc', - '<(locale_settings_dir)/locale_settings_sk.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_sk.rc', - '<(webkit_strings_dir)/webkit_strings_sk.rc', - '<(app_strings_dir)/app_strings_sk.rc', - '<(app_locale_settings_dir)/app_locale_settings_sk.rc', + '<(chrome_grit_out_dir)/generated_resources_sk.rc', + '<(chrome_grit_out_dir)/locale_settings_sk.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_sk.rc', + '<(webkit_grit_out_dir)/webkit_strings_sk.rc', + '<(app_grit_out_dir)/app_strings_sk.rc', + '<(app_grit_out_dir)/app_locale_settings_sk.rc', ], }, { 'target_name': 'sl', 'msvs_guid': 'C2A444C2-9D74-4AD7-AE7C-04F5EDA17060', 'sources': [ - '<(generated_resources_dir)/generated_resources_sl.rc', - '<(locale_settings_dir)/locale_settings_sl.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_sl.rc', - '<(webkit_strings_dir)/webkit_strings_sl.rc', - '<(app_strings_dir)/app_strings_sl.rc', - '<(app_locale_settings_dir)/app_locale_settings_sl.rc', + '<(chrome_grit_out_dir)/generated_resources_sl.rc', + '<(chrome_grit_out_dir)/locale_settings_sl.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_sl.rc', + '<(webkit_grit_out_dir)/webkit_strings_sl.rc', + '<(app_grit_out_dir)/app_strings_sl.rc', + '<(app_grit_out_dir)/app_locale_settings_sl.rc', ], }, { 'target_name': 'sr', 'msvs_guid': '300C6A09-663E-48B6-8E07-A0D50CAF8F25', 'sources': [ - '<(generated_resources_dir)/generated_resources_sr.rc', - '<(locale_settings_dir)/locale_settings_sr.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_sr.rc', - '<(webkit_strings_dir)/webkit_strings_sr.rc', - '<(app_strings_dir)/app_strings_sr.rc', - '<(app_locale_settings_dir)/app_locale_settings_sr.rc', + '<(chrome_grit_out_dir)/generated_resources_sr.rc', + '<(chrome_grit_out_dir)/locale_settings_sr.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_sr.rc', + '<(webkit_grit_out_dir)/webkit_strings_sr.rc', + '<(app_grit_out_dir)/app_strings_sr.rc', + '<(app_grit_out_dir)/app_locale_settings_sr.rc', ], }, { 'target_name': 'sv', 'msvs_guid': 'B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7', 'sources': [ - '<(generated_resources_dir)/generated_resources_sv.rc', - '<(locale_settings_dir)/locale_settings_sv.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_sv.rc', - '<(webkit_strings_dir)/webkit_strings_sv.rc', - '<(app_strings_dir)/app_strings_sv.rc', - '<(app_locale_settings_dir)/app_locale_settings_sv.rc', + '<(chrome_grit_out_dir)/generated_resources_sv.rc', + '<(chrome_grit_out_dir)/locale_settings_sv.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_sv.rc', + '<(webkit_grit_out_dir)/webkit_strings_sv.rc', + '<(app_grit_out_dir)/app_strings_sv.rc', + '<(app_grit_out_dir)/app_locale_settings_sv.rc', ], }, { 'target_name': 'ta', 'msvs_guid': '7A0BA0C5-0D90-49AE-919A-4BE096F69E4F', 'sources': [ - '<(generated_resources_dir)/generated_resources_ta.rc', - '<(locale_settings_dir)/locale_settings_ta.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_ta.rc', - '<(webkit_strings_dir)/webkit_strings_ta.rc', - '<(app_strings_dir)/app_strings_ta.rc', - '<(app_locale_settings_dir)/app_locale_settings_ta.rc', + '<(chrome_grit_out_dir)/generated_resources_ta.rc', + '<(chrome_grit_out_dir)/locale_settings_ta.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_ta.rc', + '<(webkit_grit_out_dir)/webkit_strings_ta.rc', + '<(app_grit_out_dir)/app_strings_ta.rc', + '<(app_grit_out_dir)/app_locale_settings_ta.rc', ], }, { 'target_name': 'te', 'msvs_guid': '9D13D9B8-6C28-42A7-935C-B769EBC55BAA', 'sources': [ - '<(generated_resources_dir)/generated_resources_te.rc', - '<(locale_settings_dir)/locale_settings_te.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_te.rc', - '<(webkit_strings_dir)/webkit_strings_te.rc', - '<(app_strings_dir)/app_strings_te.rc', - '<(app_locale_settings_dir)/app_locale_settings_te.rc', + '<(chrome_grit_out_dir)/generated_resources_te.rc', + '<(chrome_grit_out_dir)/locale_settings_te.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_te.rc', + '<(webkit_grit_out_dir)/webkit_strings_te.rc', + '<(app_grit_out_dir)/app_strings_te.rc', + '<(app_grit_out_dir)/app_locale_settings_te.rc', ], }, { 'target_name': 'th', 'msvs_guid': '226B3533-1FF3-42F6-A8E3-C4DDBC955290', 'sources': [ - '<(generated_resources_dir)/generated_resources_th.rc', - '<(locale_settings_dir)/locale_settings_th.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_th.rc', - '<(webkit_strings_dir)/webkit_strings_th.rc', - '<(app_strings_dir)/app_strings_th.rc', - '<(app_locale_settings_dir)/app_locale_settings_th.rc', + '<(chrome_grit_out_dir)/generated_resources_th.rc', + '<(chrome_grit_out_dir)/locale_settings_th.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_th.rc', + '<(webkit_grit_out_dir)/webkit_strings_th.rc', + '<(app_grit_out_dir)/app_strings_th.rc', + '<(app_grit_out_dir)/app_locale_settings_th.rc', ], }, { 'target_name': 'tr', 'msvs_guid': '65C78BBB-8FCB-48E4-94C8-1F0F981929AF', 'sources': [ - '<(generated_resources_dir)/generated_resources_tr.rc', - '<(locale_settings_dir)/locale_settings_tr.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_tr.rc', - '<(webkit_strings_dir)/webkit_strings_tr.rc', - '<(app_strings_dir)/app_strings_tr.rc', - '<(app_locale_settings_dir)/app_locale_settings_tr.rc', + '<(chrome_grit_out_dir)/generated_resources_tr.rc', + '<(chrome_grit_out_dir)/locale_settings_tr.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_tr.rc', + '<(webkit_grit_out_dir)/webkit_strings_tr.rc', + '<(app_grit_out_dir)/app_strings_tr.rc', + '<(app_grit_out_dir)/app_locale_settings_tr.rc', ], }, { 'target_name': 'uk', 'msvs_guid': '182D578D-2DAC-4BB7-AFEC-9A2855E56F94', 'sources': [ - '<(generated_resources_dir)/generated_resources_uk.rc', - '<(locale_settings_dir)/locale_settings_uk.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_uk.rc', - '<(webkit_strings_dir)/webkit_strings_uk.rc', - '<(app_strings_dir)/app_strings_uk.rc', - '<(app_locale_settings_dir)/app_locale_settings_uk.rc', + '<(chrome_grit_out_dir)/generated_resources_uk.rc', + '<(chrome_grit_out_dir)/locale_settings_uk.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_uk.rc', + '<(webkit_grit_out_dir)/webkit_strings_uk.rc', + '<(app_grit_out_dir)/app_strings_uk.rc', + '<(app_grit_out_dir)/app_locale_settings_uk.rc', ], }, { 'target_name': 'vi', 'msvs_guid': 'DA5C6FCB-FCFD-49B8-8DDA-8351638096DB', 'sources': [ - '<(generated_resources_dir)/generated_resources_vi.rc', - '<(locale_settings_dir)/locale_settings_vi.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_vi.rc', - '<(webkit_strings_dir)/webkit_strings_vi.rc', - '<(app_strings_dir)/app_strings_vi.rc', - '<(app_locale_settings_dir)/app_locale_settings_vi.rc', + '<(chrome_grit_out_dir)/generated_resources_vi.rc', + '<(chrome_grit_out_dir)/locale_settings_vi.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_vi.rc', + '<(webkit_grit_out_dir)/webkit_strings_vi.rc', + '<(app_grit_out_dir)/app_strings_vi.rc', + '<(app_grit_out_dir)/app_locale_settings_vi.rc', ], }, { 'target_name': 'zh-CN', 'msvs_guid': 'C0C7DA58-C90D-4BDE-AE44-588997339F5D', 'sources': [ - '<(generated_resources_dir)/generated_resources_zh-CN.rc', - '<(locale_settings_dir)/locale_settings_zh-CN.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_zh-CN.rc', - '<(webkit_strings_dir)/webkit_strings_zh-CN.rc', - '<(app_strings_dir)/app_strings_zh-CN.rc', - '<(app_locale_settings_dir)/app_locale_settings_zh-CN.rc', + '<(chrome_grit_out_dir)/generated_resources_zh-CN.rc', + '<(chrome_grit_out_dir)/locale_settings_zh-CN.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_zh-CN.rc', + '<(webkit_grit_out_dir)/webkit_strings_zh-CN.rc', + '<(app_grit_out_dir)/app_strings_zh-CN.rc', + '<(app_grit_out_dir)/app_locale_settings_zh-CN.rc', ], }, { 'target_name': 'zh-TW', 'msvs_guid': 'E7B11CF0-FE40-4A69-AE20-1B882F4D7585', 'sources': [ - '<(generated_resources_dir)/generated_resources_zh-TW.rc', - '<(locale_settings_dir)/locale_settings_zh-TW.rc', - '<(chrome_strings_dir)/strings$(CHROMIUM_BUILD)_zh-TW.rc', - '<(webkit_strings_dir)/webkit_strings_zh-TW.rc', - '<(app_strings_dir)/app_strings_zh-TW.rc', - '<(app_locale_settings_dir)/app_locale_settings_zh-TW.rc', + '<(chrome_grit_out_dir)/generated_resources_zh-TW.rc', + '<(chrome_grit_out_dir)/locale_settings_zh-TW.rc', + '<(chrome_grit_out_dir)/strings$(CHROMIUM_BUILD)_zh-TW.rc', + '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', + '<(app_grit_out_dir)/app_strings_zh-TW.rc', + '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', ], }, ], diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 71c8a01..881fdff 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -37,11 +37,10 @@ 'common/common_resources.grd', 'renderer/renderer_resources.grd', ], - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], - 'grit_cmd': ['python', '../tools/grit/grit.py'], - 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py',], + 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py',], # TODO: remove this helper when we have loops in GYP - 'apply_locales_cmd': ['python', 'tools/build/apply_locales.py'], + 'apply_locales_cmd': ['python', 'tools/build/apply_locales.py',], 'browser_tests_sources': [ 'browser/browser_browsertest.cc', 'browser/browser_init_browsertest.cc', @@ -198,10 +197,10 @@ '<@(chrome_resources_inputs)', ], 'outputs': [ - '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', - '<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT).pak', + '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', + '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak', # TODO(bradnelson): move to something like this instead - #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_resources_grds))', + #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resources_grds))', # This currently cannot work because gyp only evaluates the # outputs once (rather than per case where the rule applies). # This means you end up with all the outputs from all the grd @@ -209,9 +208,9 @@ # One alternative would be to turn this into several actions, # but that would be rather verbose. ], - 'action': ['<@(grit_cmd)', '-i', + 'action': ['python', '../tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)', + 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)', '-E', '<(branded_env)', ], @@ -229,9 +228,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/browser_resources', - '<(grit_out_dir)/common_resources', - '<(grit_out_dir)/renderer_resources', + '<(grit_out_dir)', ], }, 'conditions': [ @@ -287,15 +284,16 @@ '<@(chrome_strings_inputs)', ], 'outputs': [ - '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', + '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', + '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', # TODO(bradnelson): move to something like this - #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_strings_grds))', + #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))', # See comment in chrome_resources as to why. ], - 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)', + 'action': ['python', '../tools/grit/grit.py', '-i', + '<(RULE_INPUT_PATH)', + 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)'], 'conditions': [ ['chromeos==1', { @@ -314,10 +312,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/locale_settings', - '<(grit_out_dir)/chromium_strings', - '<(grit_out_dir)/generated_resources', - '<(grit_out_dir)/google_chrome_strings', + '<(grit_out_dir)', ], }, }, @@ -326,6 +321,9 @@ 'target_name': 'theme_resources', 'type': 'none', 'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31', + 'variables': { + 'grit_path': '../tools/grit/grit.py', + }, 'actions': [ { 'action_name': 'theme_resources', @@ -346,12 +344,12 @@ '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/theme_resources\' <(input_path))', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', ], 'action': [ - '<@(grit_cmd)', + 'python', '<(grit_path)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/theme_resources', + '-o', '<(grit_out_dir)', '-D', '<(chrome_build)' ], 'conditions': [ @@ -367,7 +365,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/theme_resources', + '<(grit_out_dir)', ], }, 'conditions': [ @@ -2865,7 +2863,6 @@ '../third_party/npapi/npapi.gyp:npapi', '../webkit/webkit.gyp:glue', '../webkit/webkit.gyp:webkit', - '../webkit/webkit.gyp:webkit_resources', ], 'include_dirs': [ '..', @@ -3864,7 +3861,6 @@ 'chrome_strings', 'syncapi', 'test_support_ui', - 'theme_resources', '../base/base.gyp:base', '../net/net.gyp:net', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -4014,7 +4010,6 @@ 'debugger', 'renderer', 'syncapi', - 'theme_resources', 'test_support_unit', 'utility', '../app/app.gyp:app_resources', @@ -4644,7 +4639,6 @@ 'debugger', 'test_support_common', 'test_support_ui', - 'theme_resources', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -5330,7 +5324,6 @@ 'debugger', 'test_support_common', 'test_support_ui', - 'theme_resources', 'syncapi', '../third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net_resources', @@ -5529,7 +5522,6 @@ 'chrome_strings', 'debugger', 'test_support_common', - 'theme_resources', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -6106,7 +6098,6 @@ 'security_tests', # run time dependency 'test_support_common', 'test_support_ui', - 'theme_resources', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/libxml/libxml.gyp:libxml', @@ -6153,7 +6144,6 @@ 'chrome_strings', 'test_support_common', 'test_support_ui', - 'theme_resources', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 2c14cf1..cc497eb 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -38,7 +38,6 @@ '../../webkit.gyp:database', '../../webkit.gyp:glue', '../../webkit.gyp:webkit', - '../../webkit.gyp:webkit_resources', '../../webkit.gyp:inspector_resources', ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index a1692de..8122d20 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -8,10 +8,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'], - 'grit_cmd': ['python', '../tools/grit/grit.py'], - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', + 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], # We can't turn on warnings on Windows and Linux until we upstream the # WebKit API. @@ -246,6 +243,10 @@ 'target_name': 'webkit_resources', 'type': 'none', 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', + 'variables': { + 'grit_path': '../tools/grit/grit.py', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', + }, 'actions': [ { 'action_name': 'webkit_resources', @@ -253,19 +254,20 @@ 'input_path': 'glue/webkit_resources.grd', }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(input_path))', + '<(input_path)', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_resources\' <(input_path))', + '<(grit_out_dir)/grit/webkit_resources.h', + '<(grit_out_dir)/webkit_resources.pak', + '<(grit_out_dir)/webkit_resources.rc', ], - 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/webkit_resources'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/webkit_resources', + '<(SHARED_INTERMEDIATE_DIR)/webkit', ], }, 'conditions': [ @@ -278,6 +280,10 @@ 'target_name': 'webkit_strings', 'type': 'none', 'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', + 'variables': { + 'grit_path': '../tools/grit/grit.py', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', + }, 'actions': [ { 'action_name': 'webkit_strings', @@ -285,19 +291,20 @@ 'input_path': 'glue/webkit_strings.grd', }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(input_path))', + '<(input_path)', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_strings\' <(input_path))', + '<(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))', ], - 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/webkit_strings'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/webkit_strings', + '<(SHARED_INTERMEDIATE_DIR)/webkit', ], }, 'conditions': [ |