[Chromoting] Run jscompile over JS for HTML files (GN-only)

remoting/webapp/build_template.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi.
 
 import("//build/config/chrome_build.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/remoting_version.gni")
@@ skipping 29 matching lines @@
       rebase_path(webapp_locale_dir, root_build_dir) +
           "/@{json_suffix}/messages.json",
       "--locales_listfile",
       rebase_path(locales_listfile_output, root_build_dir),
     ]
     args += remoting_locales
   }
 }
 
 template("build_webapp_html") {
+  target_jscompile = "${target_name}_jscompile"
+  target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp"

[Dan Beam, 2015/06/03 22:09:56]

if (run_jscompile) {

+  action(target_jscompile) {
+    js_files = remoting_webapp_js_proto_files + invoker.js_files
+
+    script = "../../third_party/closure_compiler/compile.py"
+    inputs = js_files
+    outputs = [
+      target_jscompile_stamp,
+    ]
+
+    args = [
+             "--strict",
+             "--no-single-file",
+             "--success-stamp",
+             rebase_path(target_jscompile_stamp, root_build_dir),
+           ] + rebase_path(js_files, root_build_dir)
+  }

[Dan Beam, 2015/06/03 22:09:56]

}

+
   action(target_name) {
     html_template_file = invoker.html_template_file
-    html_template_files = invoker.html_template_files
+    html_template_include_files = invoker.html_template_include_files
     js_files = invoker.js_files
     html_output = invoker.html_output
 
     script = "build-html.py"
 
-    inputs = [ html_template_file ] + html_template_files + js_files
+    inputs = [ html_template_file ] + html_template_include_files + js_files
 
     outputs = [
       html_output,
     ]
 
+    if (run_jscompile) {
+      deps = [
+        ":$target_jscompile",
+      ]
+    }
+
     args = [
       rebase_path(html_output, root_build_dir),
       rebase_path(html_template_file, root_build_dir),
     ]
     args += [
       "--template-dir",
       rebase_path(remoting_dir, root_build_dir),
     ]
-    args += [ "--templates" ] + html_template_files
+    args += [ "--templates" ] + html_template_include_files
     args += [ "--js" ] + rebase_path(js_files, remoting_dir)
   }
 }
 
 template("desktop_remoting_webapp") {
   locales_listfile = target_name + "_locales"
   locales_listfile_output = "$target_gen_dir/${target_name}_locales.txt"
 
   build_locales_listfile(locales_listfile) {
     # Template uses locales_listfile_output from outer scope.
   }
 
   background_html = target_name + "_background_html"
   background_html_output = "$target_gen_dir/html/$target_name/background.html"
 
   build_webapp_html(background_html) {
     html_template_file = remoting_webapp_template_background
-    html_template_files = []
+    html_template_include_files = []

[garykac, 2015/05/18 17:08:54]

Add '_include' to make it easier to distinguish.

     js_files = remoting_webapp_background_html_all_js_files
     html_output = background_html_output
   }
 
   message_window_html = target_name + "_message_window_html"
   message_window_html_output =
       "$target_gen_dir/html/$target_name/message_window.html"
 
   build_webapp_html(message_window_html) {
     html_template_file = remoting_webapp_template_message_window
-    html_template_files = []
+    html_template_include_files = []
     js_files = remoting_webapp_message_window_html_all_js_files
     html_output = message_window_html_output
   }
 
   wcs_sandbox_html = target_name + "_wcs_sandbox_html"
   wcs_sandbox_html_output = "$target_gen_dir/html/$target_name/wcs_sandbox.html"
 
   build_webapp_html(wcs_sandbox_html) {
     html_template_file = remoting_webapp_template_wcs_sandbox
-    html_template_files = []
+    html_template_include_files = []
     js_files = remoting_webapp_wcs_sandbox_html_all_js_files
     html_output = wcs_sandbox_html_output
   }
 
   main_html = target_name + "_main_html"
   main_html_output = "$target_gen_dir/html/$target_name/main.html"
 
   build_webapp_html(main_html) {
     html_template_file = remoting_webapp_template_main
-    html_template_files = remoting_webapp_template_files
+    html_template_include_files = remoting_webapp_template_files
     js_files = remoting_webapp_crd_main_html_all_js_files
     html_output = main_html_output
   }
 
   action(target_name) {
     script = "build-webapp.py"
 
     webapp_type = invoker.webapp_type
     output_dir = invoker.output_dir
     zip_path = invoker.zip_path
@@ skipping 64 matching lines @@
   build_locales_listfile(locales_listfile) {
     # Template uses locales_listfile_output from outer scope.
   }
 
   feedback_consent_html = target_name + "_feedback_consent_html"
   feedback_consent_html_output =
       "$target_gen_dir/html/$target_name/feedback_consent.html"
 
   build_webapp_html(feedback_consent_html) {
     html_template_file = ar_feedback_consent_template
-    html_template_files = []
+    html_template_include_files = []
     js_files = ar_feedback_consent_html_all_js_files
     html_output = feedback_consent_html_output
   }
 
   loading_window_html = target_name + "_loading_window_html"
   loading_window_html_output =
       "$target_gen_dir/html/$target_name/loading_window.html"
 
   build_webapp_html(loading_window_html) {
     html_template_file = ar_loading_window_template
-    html_template_files = []
+    html_template_include_files = []
 
     # The loading window is just a reskin of the message window -- all JS code
     # is shared.
     js_files = remoting_webapp_message_window_html_all_js_files
     html_output = loading_window_html_output
   }
 
   message_window_html = target_name + "_message_window_html"
   message_window_html_output =
       "$target_gen_dir/html/$target_name/message_window.html"
 
   build_webapp_html(message_window_html) {
     html_template_file = remoting_webapp_template_message_window
-    html_template_files = []
+    html_template_include_files = []
     js_files = remoting_webapp_message_window_html_all_js_files
     html_output = message_window_html_output
   }
 
   wcs_sandbox_html = target_name + "_wcs_sandbox_html"
   wcs_sandbox_html_output = "$target_gen_dir/html/$target_name/wcs_sandbox.html"
 
   build_webapp_html(wcs_sandbox_html) {
     html_template_file = remoting_webapp_template_wcs_sandbox
-    html_template_files = []
+    html_template_include_files = []
     js_files = remoting_webapp_wcs_sandbox_html_all_js_files
     html_output = wcs_sandbox_html_output
   }
 
   main_html = target_name + "_main_html"
   main_html_output = "$target_gen_dir/html/$target_name/main.html"
 
   build_webapp_html(main_html) {
     html_template_file = ar_main_template
-    html_template_files = ar_main_template_files
+    html_template_include_files = ar_main_template_files
     js_files = ar_main_js_files
     html_output = main_html_output
   }
 
   action(target_name) {
     script = "build-webapp.py"
 
     app_key = invoker.app_key
     app_id = invoker.app_id
     app_client_id = invoker.app_client_id
@@ skipping 114 matching lines @@
     args += [
       "--manifest_key",
       manifest_key,
     ]
     args += [
       "--app_client_id",
       app_client_id,
     ]
   }
 }