Skip to content

GitLab

T
tangled
Commit ce10667d authored by Joe Downing's avatar Joe Downing Committed by Commit Bot
Browse files
Options

Cleaning up remoting resource files 

With the Webapp gone, I am updating some build rules to be less webapp
specific.

Change-Id: I420aa95f9a87095008b5c39ef552db786b2301f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947985Reviewed-by: default avatarJamie Walch <jamiewalch@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721206}
parent 07d6d99a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 73 deletions
remoting/host/BUILD.gn
View file @ ce10667d
...@@ -695,7 +695,7 @@ if (enable_remoting_host) { ...@@ -695,7 +695,7 @@ if (enable_remoting_host) {
script = "//remoting/tools/build/remoting_localize.py" script = "//remoting/tools/build/remoting_localize.py"
args = [ args = [
"--locale_dir", "--locale_dir",
rebase_path(webapp_locale_dir, root_build_dir), rebase_path(resources_locale_dir, root_build_dir),
"--variables", "--variables",
rebase_path(branding_path, root_build_dir), rebase_path(branding_path, root_build_dir),
"--template", "--template",
......
remoting/host/win/BUILD.gn
View file @ ce10667d
...@@ -252,7 +252,7 @@ remoting_localize("messages_localizing") { ...@@ -252,7 +252,7 @@ remoting_localize("messages_localizing") {
"host_messages.mc.jinja2", "host_messages.mc.jinja2",
] ]
locales = remoting_locales locales = remoting_locales
locale_dir = webapp_locale_dir locale_dir = resources_locale_dir
encoding = "utf-16" encoding = "utf-16"
# This target is funny. It only produces one file and the output doesn't # This target is funny. It only produces one file and the output doesn't
...@@ -513,7 +513,7 @@ remoting_localize("remoting_windows_resources") { ...@@ -513,7 +513,7 @@ remoting_localize("remoting_windows_resources") {
output = "$root_gen_dir/remoting/{{source_name_part}}" output = "$root_gen_dir/remoting/{{source_name_part}}"
locale_dir = webapp_locale_dir locale_dir = resources_locale_dir
encoding = "utf-16" encoding = "utf-16"
......
remoting/ios/app/resources/BUILD.gn
View file @ ce10667d
...@@ -96,7 +96,7 @@ action("infoplist_strings") { ...@@ -96,7 +96,7 @@ action("infoplist_strings") {
script = "//remoting/tools/build/remoting_localize.py" script = "//remoting/tools/build/remoting_localize.py"
args = [ args = [
"--locale_dir", "--locale_dir",
rebase_path(webapp_locale_dir, root_build_dir), rebase_path(resources_locale_dir, root_build_dir),
"--variables", "--variables",
rebase_path(branding_path, root_build_dir), rebase_path(branding_path, root_build_dir),
"--template", "--template",
......
remoting/remoting_locales.gni
View file @ ce10667d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
webapp_locale_dir = "$root_gen_dir/remoting/webapp/_locales" resources_locale_dir = "$root_gen_dir/remoting/resources/_locales"
# See also remoting_locales_with_underscores below. # See also remoting_locales_with_underscores below.
remoting_locales = [ remoting_locales = [
...@@ -168,7 +168,7 @@ remoting_android_locales = [ ...@@ -168,7 +168,7 @@ remoting_android_locales = [
] ]
# The list of .json files generated by remoting_strings.grd. # The list of .json files generated by remoting_strings.grd.
remoting_webapp_locale_files = remoting_resources_locale_files =
process_file_template( process_file_template(
messages_locales, messages_locales,
[ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ]) [ "remoting/resources/_locales/{{source_name_part}}/messages.json" ])
remoting/resources/BUILD.gn
View file @ ce10667d
...@@ -17,14 +17,10 @@ group("resources") { ...@@ -17,14 +17,10 @@ group("resources") {
] ]
} }
# TODO(GYP) enable verify_resources. The bots are complaining about
# gen/main.html not being found but this doesn't seems to reproduce locally.
action("verify_resources") { action("verify_resources") {
script = "//remoting/tools/verify_resources.py" script = "//remoting/tools/verify_resources.py"
sources_to_verify = [ sources_to_verify = [
# "$root_gen_dir/main.html",
"../host/continue_window_mac.mm", "../host/continue_window_mac.mm",
"../host/disconnect_window_mac.mm", "../host/disconnect_window_mac.mm",
"../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2", "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
...@@ -46,10 +42,6 @@ action("verify_resources") { ...@@ -46,10 +42,6 @@ action("verify_resources") {
"-r", "-r",
rebase_path("remoting_strings.grd", root_build_dir), rebase_path("remoting_strings.grd", root_build_dir),
] + rebase_path(sources_to_verify, root_build_dir) ] + rebase_path(sources_to_verify, root_build_dir)
deps = [
# "//remoting/webapp:webapp",
] # Generates main.html.
} }
if (is_android) { if (is_android) {
...@@ -78,7 +70,7 @@ grit("strings") { ...@@ -78,7 +70,7 @@ grit("strings") {
process_file_template(remoting_locales, process_file_template(remoting_locales,
[ "remoting/resources/{{source_name_part}}.pak" ]) [ "remoting/resources/{{source_name_part}}.pak" ])
outputs += remoting_webapp_locale_files outputs += remoting_resources_locale_files
if (is_android) { if (is_android) {
outputs += android_string_outputs outputs += android_string_outputs
......
remoting/resources/remoting_strings.grd
View file @ ce10667d
...@@ -81,80 +81,80 @@ ...@@ -81,80 +81,80 @@
<output filename="remoting/resources/zh-CN.pak" lang="zh-CN" type="data_package"/> <output filename="remoting/resources/zh-CN.pak" lang="zh-CN" type="data_package"/>
<output filename="remoting/resources/zh-TW.pak" lang="zh-TW" type="data_package"/> <output filename="remoting/resources/zh-TW.pak" lang="zh-TW" type="data_package"/>
<output filename="remoting/webapp/_locales/am/messages.json" lang="am" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/am/messages.json" lang="am" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ar/messages.json" lang="ar" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ar/messages.json" lang="ar" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/bg/messages.json" lang="bg" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/bg/messages.json" lang="bg" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/bn/messages.json" lang="bn" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/bn/messages.json" lang="bn" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ca/messages.json" lang="ca" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ca/messages.json" lang="ca" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/cs/messages.json" lang="cs" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/cs/messages.json" lang="cs" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/da/messages.json" lang="da" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/da/messages.json" lang="da" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/de/messages.json" lang="de" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/de/messages.json" lang="de" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/fa/messages.json" lang="fa" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/fa/messages.json" lang="fa" type="chrome_messages_json"/>
<if expr="not is_ios or not _official_build"> <if expr="not is_ios or not _official_build">
<!-- The fake-bidi locale isn't accepted by the app store. --> <!-- The fake-bidi locale isn't accepted by the app store. -->
<output filename="remoting/webapp/_locales/fake_bidi/messages.json" lang="fake-bidi" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/fake_bidi/messages.json" lang="fake-bidi" type="chrome_messages_json"/>
</if> </if>
<output filename="remoting/webapp/_locales/el/messages.json" lang="el" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/el/messages.json" lang="el" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/en/messages.json" lang="en" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/en/messages.json" lang="en" type="chrome_messages_json"/>
<if expr="chromeos"> <if expr="chromeos">
<!-- lang="en-US" will create an empty json file. --> <!-- lang="en-US" will create an empty json file. -->
<output filename="remoting/webapp/_locales/en_US/messages.json" lang="en" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/en_US/messages.json" lang="en" type="chrome_messages_json"/>
</if> </if>
<output filename="remoting/webapp/_locales/en_GB/messages.json" lang="en-GB" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/en_GB/messages.json" lang="en-GB" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/es/messages.json" lang="es" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/es/messages.json" lang="es" type="chrome_messages_json"/>
<if expr="is_ios"> <if expr="is_ios">
<!-- iOS uses es-MX for es-419 --> <!-- iOS uses es-MX for es-419 -->
<output filename="remoting/webapp/_locales/es_MX/messages.json" lang="es-419" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/es_MX/messages.json" lang="es-419" type="chrome_messages_json"/>
</if> </if>
<if expr="not is_ios"> <if expr="not is_ios">
<output filename="remoting/webapp/_locales/es_419/messages.json" lang="es-419" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/es_419/messages.json" lang="es-419" type="chrome_messages_json"/>
</if> </if>
<output filename="remoting/webapp/_locales/et/messages.json" lang="et" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/et/messages.json" lang="et" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/fi/messages.json" lang="fi" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/fi/messages.json" lang="fi" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/fil/messages.json" lang="fil" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/fil/messages.json" lang="fil" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/fr/messages.json" lang="fr" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/fr/messages.json" lang="fr" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/gu/messages.json" lang="gu" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/gu/messages.json" lang="gu" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/he/messages.json" lang="he" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/he/messages.json" lang="he" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/hi/messages.json" lang="hi" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/hi/messages.json" lang="hi" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/hr/messages.json" lang="hr" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/hr/messages.json" lang="hr" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/hu/messages.json" lang="hu" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/hu/messages.json" lang="hu" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/id/messages.json" lang="id" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/id/messages.json" lang="id" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/it/messages.json" lang="it" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/it/messages.json" lang="it" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ja/messages.json" lang="ja" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ja/messages.json" lang="ja" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/kn/messages.json" lang="kn" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/kn/messages.json" lang="kn" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ko/messages.json" lang="ko" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ko/messages.json" lang="ko" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/lt/messages.json" lang="lt" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/lt/messages.json" lang="lt" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/lv/messages.json" lang="lv" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/lv/messages.json" lang="lv" type="chrome_messages_json"/>
<!-- The translation console uses 'no' for Norwegian (Bokmål), but Chrome uses 'nb'. --> <!-- The translation console uses 'no' for Norwegian (Bokmål), but Chrome uses 'nb'. -->
<output filename="remoting/webapp/_locales/ml/messages.json" lang="ml" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ml/messages.json" lang="ml" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/mr/messages.json" lang="mr" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/mr/messages.json" lang="mr" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ms/messages.json" lang="ms" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ms/messages.json" lang="ms" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/nb/messages.json" lang="no" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/nb/messages.json" lang="no" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/nl/messages.json" lang="nl" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/nl/messages.json" lang="nl" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/pl/messages.json" lang="pl" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/pl/messages.json" lang="pl" type="chrome_messages_json"/>
<if expr="is_ios"> <if expr="is_ios">
<!-- iOS uses pt for pt-BR --> <!-- iOS uses pt for pt-BR -->
<output filename="remoting/webapp/_locales/pt/messages.json" lang="pt-BR" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/pt/messages.json" lang="pt-BR" type="chrome_messages_json"/>
</if> </if>
<if expr="not is_ios"> <if expr="not is_ios">
<output filename="remoting/webapp/_locales/pt_BR/messages.json" lang="pt-BR" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/pt_BR/messages.json" lang="pt-BR" type="chrome_messages_json"/>
</if> </if>
<output filename="remoting/webapp/_locales/pt_PT/messages.json" lang="pt-PT" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/pt_PT/messages.json" lang="pt-PT" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ro/messages.json" lang="ro" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ro/messages.json" lang="ro" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ru/messages.json" lang="ru" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ru/messages.json" lang="ru" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/sk/messages.json" lang="sk" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/sk/messages.json" lang="sk" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/sl/messages.json" lang="sl" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/sl/messages.json" lang="sl" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/sr/messages.json" lang="sr" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/sr/messages.json" lang="sr" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/sv/messages.json" lang="sv" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/sv/messages.json" lang="sv" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/sw/messages.json" lang="sw" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/sw/messages.json" lang="sw" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/ta/messages.json" lang="ta" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/ta/messages.json" lang="ta" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/te/messages.json" lang="te" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/te/messages.json" lang="te" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/th/messages.json" lang="th" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/th/messages.json" lang="th" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/tr/messages.json" lang="tr" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/tr/messages.json" lang="tr" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/uk/messages.json" lang="uk" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/uk/messages.json" lang="uk" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/vi/messages.json" lang="vi" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/vi/messages.json" lang="vi" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/zh_CN/messages.json" lang="zh-CN" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/zh_CN/messages.json" lang="zh-CN" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/zh_TW/messages.json" lang="zh-TW" type="chrome_messages_json"/> <output filename="remoting/resources/_locales/zh_TW/messages.json" lang="zh-TW" type="chrome_messages_json"/>
<if expr="is_android"> <if expr="is_android">
<output filename="remoting/android/res/values-am/remoting_strings.xml" lang="am" type="android" context="android_java"/> <output filename="remoting/android/res/values-am/remoting_strings.xml" lang="am" type="android" context="android_java"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment