diff options
| -rw-r--r-- | app/app.gyp | 8 | ||||
| -rw-r--r-- | build/common.gypi | 11 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 12 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 21 |
4 files changed, 22 insertions, 30 deletions
diff --git a/app/app.gyp b/app/app.gyp index 449b9bb..613f6b7 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -4,6 +4,8 @@ { 'variables': { + # TODO: remove this helper when we have loops in GYP + 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], 'chromium_code': 1, }, 'target_defaults': { @@ -246,10 +248,8 @@ }, 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/app/grit/<(RULE_INPUT_ROOT).h', - # TODO(benl) Generate this list from a helper script, like - # repack_locales_cmd in chrome.gyp (see TODO(mmoss)) - '<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_ar.pak', - '<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_en-US.pak', + # TODO: remove this helper when we have loops in GYP + '>!@(<(apply_locales_cmd) \'<(SHARED_INTERMEDIATE_DIR)/app/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', ], 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(grit_out_dir)'], diff --git a/build/common.gypi b/build/common.gypi index 5f09ea6..af7c3fd 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -189,6 +189,17 @@ ], }], ], + + # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' + # so Cocoa is happy (http://crbug.com/20441). + 'locales': [ + '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', + ], }, 'target_defaults': { 'variables': { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7e62012..fe10cdd 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -23,18 +23,6 @@ ], 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', - # TODO(mmoss) This might need to go somewhere more general, then we can use - # it to also rewrite app/locales/locales.gyp with a helper script. - # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' - # so Cocoa is happy (http://crbug.com/20441). - 'locales': [ - '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', - ], 'chrome_strings_grds': [ # Localizable resources. 'app/resources/locale_settings.grd', diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index b47d34e..c7dbce7 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4,6 +4,8 @@ { 'variables': { + # TODO: remove this helper when we have loops in GYP + 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], 'feature_defines': [ 'ENABLE_CHANNEL_MESSAGING=1', 'ENABLE_DATABASE=1', @@ -518,7 +520,7 @@ '--include', '../third_party/WebKit/WebCore/css', '--include', '../third_party/WebKit/WebCore/dom', '--include', '../third_party/WebKit/WebCore/html', - '--include', '../third_party/WebKit/WebCore/notifications', + '--include', '../third_party/WebKit/WebCore/notifications', '--include', '../third_party/WebKit/WebCore/page', '--include', '../third_party/WebKit/WebCore/plugins', '--include', '../third_party/WebKit/WebCore/svg', @@ -641,10 +643,10 @@ '../third_party/WebKit/WebCore/css/CSSUnknownRule.idl', # A few things can't be excluded by patterns. List them individually. - + # Don't build StorageNamespace. We have our own implementation. '../third_party/WebKit/WebCore/storage/StorageNamespace.cpp', - + # Use history/BackForwardListChromium.cpp instead. '../third_party/WebKit/WebCore/history/BackForwardList.cpp', @@ -1198,17 +1200,8 @@ ], 'outputs': [ '<(grit_out_dir)/grit/webkit_strings.h', - # TODO(benl) Generate this list from a helper script, like - # repack_locales_cmd in chrome.gyp (see TODO(mmoss)) - '<(grit_out_dir)/webkit_strings_ar.pak', - '<(grit_out_dir)/webkit_strings_da.pak', - '<(grit_out_dir)/webkit_strings_da.rc', - '<(grit_out_dir)/webkit_strings_en-US.pak', - '<(grit_out_dir)/webkit_strings_en-US.rc', - '<(grit_out_dir)/webkit_strings_he.pak', - '<(grit_out_dir)/webkit_strings_he.rc', - '<(grit_out_dir)/webkit_strings_zh-TW.pak', - '<(grit_out_dir)/webkit_strings_zh-TW.rc', + # TODO: remove this helper when we have loops in GYP + '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/webkit_strings_ZZLOCALE.pak\' <(locales))', ], 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', |