| Index: remoting/resources/BUILD.gn
|
| diff --git a/remoting/resources/BUILD.gn b/remoting/resources/BUILD.gn
|
| index 4caecf9ff516210bdb2ec3dd6b3ab9440d0b984d..0328231eac2eda76f5e3d91db1e02c3e3936104e 100644
|
| --- a/remoting/resources/BUILD.gn
|
| +++ b/remoting/resources/BUILD.gn
|
| @@ -85,14 +85,15 @@ remoting_locales_with_underscores += [
|
| ]
|
|
|
| if (is_chromeos) {
|
| - remoting_locales += ["en-US"]
|
| - remoting_locales_with_underscores += ["en_US"]
|
| + remoting_locales += [ "en-US" ]
|
| + remoting_locales_with_underscores += [ "en_US" ]
|
| }
|
|
|
| group("resources") {
|
| deps = [
|
| ":copy_locales",
|
| ":strings",
|
| +
|
| #":verify_resources", TODO(GYP) enable this.
|
| ]
|
| }
|
| @@ -100,49 +101,51 @@ 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.
|
| if (false) {
|
| -
|
| -action("verify_resources") {
|
| - script = "//remoting/tools/verify_resources.py"
|
| -
|
| - sources_to_verify = [
|
| - "$root_gen_dir/main.html",
|
| - "../base/resources_unittest.cc",
|
| - "../host/continue_window_mac.mm",
|
| - "../host/disconnect_window_mac.mm",
|
| - "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
|
| - "../host/mac/me2me_preference_pane-InfoPlist.strings.jinja2",
|
| - "../host/win/core.rc.jinja2",
|
| - "../host/win/host_messages.mc.jinja2",
|
| - "../host/win/version.rc.jinja2",
|
| - "../resources/play_store_resources.cc",
|
| - "../webapp/background/background.js",
|
| - "../webapp/butter_bar.js",
|
| - "../webapp/client_screen.js",
|
| - "../webapp/error.js",
|
| - "../webapp/host_list.js",
|
| - "../webapp/host_setup_dialog.js",
|
| - "../webapp/host_table_entry.js",
|
| - "../webapp/manifest.json.jinja2",
|
| - "../webapp/paired_client_manager.js",
|
| - "../webapp/remoting.js",
|
| - "../webapp/window_frame.js",
|
| - ]
|
| -
|
| - inputs = [
|
| - "remoting_strings.grd",
|
| - ] + sources_to_verify
|
| -
|
| - stampfile = "$root_build_dir/remoting_resources_verified_stamp"
|
| - outputs = [ stampfile ]
|
| -
|
| - args = [
|
| - "-t", rebase_path(stampfile, root_build_dir),
|
| - "-r", rebase_path("remoting_strings.grd", root_build_dir),
|
| - ] + rebase_path(sources_to_verify, root_build_dir)
|
| -
|
| - deps = [ "//remoting/webapp:html" ] # Generates main.html.
|
| -}
|
| -
|
| + action("verify_resources") {
|
| + script = "//remoting/tools/verify_resources.py"
|
| +
|
| + sources_to_verify = [
|
| + "$root_gen_dir/main.html",
|
| + "../base/resources_unittest.cc",
|
| + "../host/continue_window_mac.mm",
|
| + "../host/disconnect_window_mac.mm",
|
| + "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
|
| + "../host/mac/me2me_preference_pane-InfoPlist.strings.jinja2",
|
| + "../host/win/core.rc.jinja2",
|
| + "../host/win/host_messages.mc.jinja2",
|
| + "../host/win/version.rc.jinja2",
|
| + "../resources/play_store_resources.cc",
|
| + "../webapp/background/background.js",
|
| + "../webapp/butter_bar.js",
|
| + "../webapp/client_screen.js",
|
| + "../webapp/error.js",
|
| + "../webapp/host_list.js",
|
| + "../webapp/host_setup_dialog.js",
|
| + "../webapp/host_table_entry.js",
|
| + "../webapp/manifest.json.jinja2",
|
| + "../webapp/paired_client_manager.js",
|
| + "../webapp/remoting.js",
|
| + "../webapp/window_frame.js",
|
| + ]
|
| +
|
| + inputs = [ "remoting_strings.grd" ] + sources_to_verify
|
| +
|
| + stampfile = "$root_build_dir/remoting_resources_verified_stamp"
|
| + outputs = [
|
| + stampfile,
|
| + ]
|
| +
|
| + args = [
|
| + "-t",
|
| + rebase_path(stampfile, root_build_dir),
|
| + "-r",
|
| + rebase_path("remoting_strings.grd", root_build_dir),
|
| + ] + rebase_path(sources_to_verify, root_build_dir)
|
| +
|
| + deps = [
|
| + "//remoting/webapp:html",
|
| + ] # Generates main.html.
|
| + }
|
| } # if false
|
|
|
| grit("strings") {
|
| @@ -159,9 +162,9 @@ grit("strings") {
|
|
|
| # The grd produces a *.pak file and a messages.json file (this one uses
|
| # underscores instead of hyphens) for each locale.
|
| - outputs += process_file_template(
|
| - remoting_locales,
|
| - [ "remoting/resources/{{source_name_part}}.pak" ])
|
| + outputs +=
|
| + process_file_template(remoting_locales,
|
| + [ "remoting/resources/{{source_name_part}}.pak" ])
|
|
|
| messages_locales = remoting_locales_with_underscores
|
| if (!is_chromeos) {
|
| @@ -171,8 +174,8 @@ grit("strings") {
|
| messages_locales += [ "en_US" ]
|
| }
|
| outputs += process_file_template(
|
| - messages_locales,
|
| - [ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])
|
| + messages_locales,
|
| + [ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])
|
| }
|
|
|
| action("copy_locales") {
|
| @@ -182,28 +185,32 @@ action("copy_locales") {
|
| # replacement over the locales. Here, we can do this in GN script by
|
| # pretending the locale list is a list of files. The {{source_name_part}}
|
| # will just expand to the locale name.
|
| - inputs = process_file_template(
|
| - remoting_locales,
|
| - [ "$target_gen_dir/{{source_name_part}}.pak" ])
|
| + inputs = process_file_template(remoting_locales,
|
| + [ "$target_gen_dir/{{source_name_part}}.pak" ])
|
|
|
| # Likewise, process the outputs in the same way as the inputs.
|
| if (is_mac || is_ios) {
|
| # On mac, use underscores instead of hyphens and put the files in a
|
| # different place.
|
| outputs = process_file_template(
|
| - remoting_locales_with_underscores,
|
| - [ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ])
|
| + remoting_locales_with_underscores,
|
| + [ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ])
|
| } else {
|
| outputs = process_file_template(
|
| - remoting_locales,
|
| - [ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ])
|
| + remoting_locales,
|
| + [ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ])
|
| }
|
|
|
| args = [
|
| - "-p", os,
|
| - "-g", rebase_path(root_gen_dir, root_build_dir),
|
| - "-x", rebase_path(root_out_dir, root_build_dir),
|
| - ] + remoting_locales
|
| + "-p",
|
| + os,
|
| + "-g",
|
| + rebase_path(root_gen_dir, root_build_dir),
|
| + "-x",
|
| + rebase_path(root_out_dir, root_build_dir),
|
| + ] + remoting_locales
|
|
|
| - deps = [ ":strings" ]
|
| + deps = [
|
| + ":strings",
|
| + ]
|
| }
|
|
|