| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 18892)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -156,11 +156,9 @@
|
| '../tools/grit/grit.py',
|
| ],
|
| 'outputs': [
|
| - '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
|
| - '<(grit_out_dir)/<(RULE_INPUT_ROOT)_da.pak',
|
| - '<(grit_out_dir)/<(RULE_INPUT_ROOT)_en-US.pak',
|
| - '<(grit_out_dir)/<(RULE_INPUT_ROOT)_he.pak',
|
| - '<(grit_out_dir)/<(RULE_INPUT_ROOT)_zh-TW.pak',
|
| + '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h'] +
|
| + [ '<(grit_out_dir)/<(RULE_INPUT_ROOT)_'+i+'.pak'
|
| + for i in ['ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'nb', 'nl', 'or', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW']
|
| ],
|
| 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
|
| 'build', '-o', '<(grit_out_dir)',
|
| @@ -2456,11 +2454,8 @@
|
| },
|
| {
|
| 'destination': '<(PRODUCT_DIR)/locales',
|
| - 'files': ['<(INTERMEDIATE_DIR)/repack/da.pak',
|
| - '<(INTERMEDIATE_DIR)/repack/en-US.pak',
|
| - '<(INTERMEDIATE_DIR)/repack/he.pak',
|
| - '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
|
| - ],
|
| + 'files': ['<(INTERMEDIATE_DIR)/repack/'+i+'.pak'
|
| + for i in ['ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'nb', 'nl', 'or', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW']],
|
| },
|
| {
|
| 'destination': '<(PRODUCT_DIR)/themes',
|
| @@ -2754,25 +2749,24 @@
|
| ]
|
| }],
|
| ],
|
| - },
|
| - {
|
| - # TODO(mark): Make this work with more languages than the
|
| - # hardcoded da, en-US, he, zh-TW.
|
| - 'action_name': 'repack_locale_da',
|
| + }]
|
| + +
|
| + [{
|
| + 'action_name': 'repack_locale_'+i,
|
| 'variables': {
|
| 'pak_inputs': [
|
| - '<(grit_out_dir)/generated_resources_da.pak',
|
| - '<(grit_out_dir)/locale_settings_da.pak',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak',
|
| + '<(grit_out_dir)/generated_resources_'+i+'.pak',
|
| + '<(grit_out_dir)/locale_settings_'+i+'.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_'+i+'.pak',
|
| ],
|
| 'conditions': [
|
| ['branding=="Chrome"', {
|
| 'pak_inputs': [
|
| - '<(grit_out_dir)/google_chrome_strings_da.pak',
|
| + '<(grit_out_dir)/google_chrome_strings_'+i+'.pak',
|
| ]
|
| }, { # else: branding!="Chrome"
|
| 'pak_inputs': [
|
| - '<(grit_out_dir)/chromium_strings_da.pak',
|
| + '<(grit_out_dir)/chromium_strings_'+i+'.pak',
|
| ]
|
| }],
|
| ],
|
| @@ -2788,136 +2782,18 @@
|
| # the nibs too, or the app fails to launch in this language.
|
| # Currently, this is only for ui_tests, which won't work on
|
| # the Mac anyway, so temporarily disable until we have the
|
| - # full strategy figured out. This goes for he and zh below.
|
| - # '<(INTERMEDIATE_DIR)/repack/da.lproj/locale.pak',
|
| + # full strategy figured out. This goes for he and zh.
|
| + # '<(INTERMEDIATE_DIR)/repack/'+i+'.lproj/locale.pak',
|
| ],
|
| }, { # else: OS!="mac"
|
| 'outputs': [
|
| - '<(INTERMEDIATE_DIR)/repack/da.pak',
|
| + '<(INTERMEDIATE_DIR)/repack/'+i+'.pak',
|
| ],
|
| }],
|
| ],
|
| 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
|
| - },
|
| - {
|
| - # TODO(mark): Make this work with more languages than the
|
| - # hardcoded da, en-US, he, zh-TW.
|
| - 'action_name': 'repack_locale_en_us',
|
| - 'variables': {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/generated_resources_en-US.pak',
|
| - '<(grit_out_dir)/locale_settings_en-US.pak',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
|
| - ],
|
| - 'conditions': [
|
| - ['branding=="Chrome"', {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/google_chrome_strings_en-US.pak',
|
| - ]
|
| - }, { # else: branding!="Chrome"
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/chromium_strings_en-US.pak',
|
| - ]
|
| - }],
|
| - ],
|
| - },
|
| - 'inputs': [
|
| - '<(repack_path)',
|
| - '<@(pak_inputs)',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="mac"', {
|
| - 'outputs': [
|
| - '<(INTERMEDIATE_DIR)/repack/en.lproj/locale.pak',
|
| - ],
|
| - }, { # else: OS!="mac"
|
| - 'outputs': [
|
| - '<(INTERMEDIATE_DIR)/repack/en-US.pak',
|
| - ],
|
| - }],
|
| - ],
|
| - 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
|
| - 'process_outputs_as_mac_bundle_resources': 1,
|
| - },
|
| - {
|
| - # TODO(mark): Make this work with more languages than the
|
| - # hardcoded da, en-US, he, zh-TW.
|
| - 'action_name': 'repack_locale_he',
|
| - 'variables': {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/generated_resources_he.pak',
|
| - '<(grit_out_dir)/locale_settings_he.pak',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak',
|
| - ],
|
| - 'conditions': [
|
| - ['branding=="Chrome"', {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/google_chrome_strings_he.pak',
|
| - ]
|
| - }, { # else: branding!="Chrome"
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/chromium_strings_he.pak',
|
| - ]
|
| - }],
|
| - ],
|
| - },
|
| - 'inputs': [
|
| - '<(repack_path)',
|
| - '<@(pak_inputs)',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="mac"', {
|
| - 'outputs': [
|
| - # '<(INTERMEDIATE_DIR)/repack/he.lproj/locale.pak',
|
| - ],
|
| - }, { # else: OS!="mac"
|
| - 'outputs': [
|
| - '<(INTERMEDIATE_DIR)/repack/he.pak',
|
| - ],
|
| - }],
|
| - ],
|
| - 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
|
| - },
|
| - {
|
| - # TODO(mark): Make this work with more languages than the
|
| - # hardcoded da, en-US, he, zh-TW.
|
| - 'action_name': 'repack_locale_zh_tw',
|
| - 'variables': {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/generated_resources_zh-TW.pak',
|
| - '<(grit_out_dir)/locale_settings_zh-TW.pak',
|
| - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak',
|
| - ],
|
| - 'conditions': [
|
| - ['branding=="Chrome"', {
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/google_chrome_strings_zh-TW.pak',
|
| - ]
|
| - }, { # else: branding!="Chrome"
|
| - 'pak_inputs': [
|
| - '<(grit_out_dir)/chromium_strings_zh-TW.pak',
|
| - ]
|
| - }],
|
| - ],
|
| - },
|
| - 'inputs': [
|
| - '<(repack_path)',
|
| - '<@(pak_inputs)',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="mac"', {
|
| - 'outputs': [
|
| - # '<(INTERMEDIATE_DIR)/repack/zh.lproj/locale.pak',
|
| - ],
|
| - }, { # else: OS!="mac"
|
| - 'outputs': [
|
| - '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
|
| - ],
|
| - }],
|
| - ],
|
| - 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
|
| - },
|
| - ],
|
| + }
|
| + for i in ['ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'nb', 'nl', 'or', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW'] ],
|
| 'sources!': [
|
| 'app/chrome_exe_main.cc',
|
| 'app/client_util.cc',
|
|
|