Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1047)

Side by Side Diff: remoting/webapp/build_template.gni

Issue 1169653002: Don't run commands that require java unless run_jscompile is true. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi. 5 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi.
6 6
7 import("//build/config/chrome_build.gni") 7 import("//build/config/chrome_build.gni")
8 import("//remoting/remoting_locales.gni") 8 import("//remoting/remoting_locales.gni")
9 import("//remoting/remoting_options.gni") 9 import("//remoting/remoting_options.gni")
10 import("//remoting/remoting_version.gni") 10 import("//remoting/remoting_version.gni")
(...skipping 29 matching lines...) Expand all
40 rebase_path(webapp_locale_dir, root_build_dir) + 40 rebase_path(webapp_locale_dir, root_build_dir) +
41 "/@{json_suffix}/messages.json", 41 "/@{json_suffix}/messages.json",
42 "--locales_listfile", 42 "--locales_listfile",
43 rebase_path(locales_listfile_output, root_build_dir), 43 rebase_path(locales_listfile_output, root_build_dir),
44 ] 44 ]
45 args += remoting_locales 45 args += remoting_locales
46 } 46 }
47 } 47 }
48 48
49 template("build_webapp_html") { 49 template("build_webapp_html") {
50 target_jscompile = "${target_name}_jscompile" 50 target_jscompile = ""
51 target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp"
52 action(target_jscompile) {
53 js_files = remoting_webapp_js_proto_files + invoker.js_files
54 51
55 script = "../../third_party/closure_compiler/compile.py" 52 if (run_jscompile) {
56 inputs = js_files 53 target_jscompile = "${target_name}_jscompile"
57 outputs = [ 54 target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp"
58 target_jscompile_stamp, 55 action(target_jscompile) {
59 ] 56 js_files = remoting_webapp_js_proto_files + invoker.js_files
60 57
61 args = [ 58 script = "../../third_party/closure_compiler/compile.py"
62 "--strict", 59 inputs = js_files
63 "--no-single-file", 60 outputs = [
64 "--externs", 61 target_jscompile_stamp,
65 "../../third_party/closure_compiler/externs/chrome_extensions.js", 62 ]
66 "--success-stamp", 63
67 rebase_path(target_jscompile_stamp, root_build_dir), 64 args = [
68 ] + rebase_path(js_files, root_build_dir) 65 "--strict",
66 "--no-single-file",
67 "--externs",
68 "../../third_party/closure_compiler/externs/chrome_extensions.js",
69 "--success-stamp",
70 rebase_path(target_jscompile_stamp, root_build_dir),
71 ]
72 args += rebase_path(js_files, root_build_dir)
73 }
69 } 74 }
70 75
71 action(target_name) { 76 action(target_name) {
72 html_template_file = invoker.html_template_file 77 html_template_file = invoker.html_template_file
73 html_template_include_files = invoker.html_template_include_files 78 html_template_include_files = invoker.html_template_include_files
74 js_files = invoker.js_files 79 js_files = invoker.js_files
75 html_output = invoker.html_output 80 html_output = invoker.html_output
76 81
77 script = "build-html.py" 82 script = "build-html.py"
78 83
79 inputs = [ html_template_file ] + html_template_include_files + js_files 84 inputs = [ html_template_file ] + html_template_include_files + js_files
80 85
81 outputs = [ 86 outputs = [
82 html_output, 87 html_output,
83 ] 88 ]
84 89
85 if (run_jscompile) { 90 if (target_jscompile != "") {
garykac 2015/06/05 21:09:35 I actually don't like this because it now takes mo
Dan Beam 2015/06/05 21:14:51 I think it reads OK: if there's something to compi
86 deps = [ 91 deps = [
87 ":$target_jscompile", 92 ":$target_jscompile",
88 ] 93 ]
89 } 94 }
90 95
91 args = [ 96 args = [
92 rebase_path(html_output, root_build_dir), 97 rebase_path(html_output, root_build_dir),
93 rebase_path(html_template_file, root_build_dir), 98 rebase_path(html_template_file, root_build_dir),
94 ] 99 ]
95 args += [ 100 args += [
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 args += [ 408 args += [
404 "--manifest_key", 409 "--manifest_key",
405 manifest_key, 410 manifest_key,
406 ] 411 ]
407 args += [ 412 args += [
408 "--app_client_id", 413 "--app_client_id",
409 app_client_id, 414 app_client_id,
410 ] 415 ]
411 } 416 }
412 } 417 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698