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

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

Issue 1152583011: Refactor compile_js.gypi to support script_args and closure_args (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase 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 | « remoting/remoting_webapp_compile.gypi ('k') | third_party/closure_compiler/build/inputs.py » ('j') | 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")
11 import("//remoting/webapp/files.gni") 11 import("//remoting/webapp/files.gni")
12 import("//third_party/closure_compiler/closure_args.gni")
12 13
13 # The base remoting directory that is used as the root directory for file 14 # The base remoting directory that is used as the root directory for file
14 # references. Many of the scripts rely on the files being specified relative 15 # references. Many of the scripts rely on the files being specified relative
15 # to this directory. 16 # to this directory.
16 remoting_dir = "//remoting" 17 remoting_dir = "//remoting"
17 18
18 buildtype = "Dev" 19 buildtype = "Dev"
19 if (!is_debug) { 20 if (!is_debug) {
20 if (is_official_build) { 21 if (is_official_build) {
21 buildtype = "Official" 22 buildtype = "Official"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 externs = 58 externs =
58 remoting_webapp_js_externs_files + 59 remoting_webapp_js_externs_files +
59 [ "../../third_party/closure_compiler/externs/chrome_extensions.js" ] 60 [ "../../third_party/closure_compiler/externs/chrome_extensions.js" ]
60 61
61 script = "../../third_party/closure_compiler/compile.py" 62 script = "../../third_party/closure_compiler/compile.py"
62 inputs = js_files 63 inputs = js_files
63 outputs = [ 64 outputs = [
64 target_jscompile_stamp, 65 target_jscompile_stamp,
65 ] 66 ]
66 67
67 args = [ 68 extra_closure_args = [
68 "--strict", 69 "jscomp_error=reportUnknownTypes",
69 "--no-single-file", 70 "jscomp_error=duplicate",
71 "jscomp_error=misplacedTypeAnnotation",
70 ] 72 ]
71 args += [ "--externs" ] + rebase_path(externs, root_build_dir) 73
74 args = rebase_path(js_files, root_build_dir)
72 args += [ 75 args += [
73 "--success-stamp", 76 "--no-single-file",
74 rebase_path(target_jscompile_stamp, root_build_dir), 77 "--externs",
75 ] 78 rebase_path(externs, root_build_dir),
76 args += rebase_path(js_files, root_build_dir) 79 "--out-file",
80 rebase_path(target_jscompile_stamp, root_build_dir),
81 "--closure-args",
82 ] + closure_args + extra_closure_args
77 } 83 }
78 } 84 }
79 85
80 action(target_name) { 86 action(target_name) {
81 html_template_file = invoker.html_template_file 87 html_template_file = invoker.html_template_file
82 html_template_include_files = invoker.html_template_include_files 88 html_template_include_files = invoker.html_template_include_files
83 js_files = invoker.js_files 89 js_files = invoker.js_files
84 html_output = invoker.html_output 90 html_output = invoker.html_output
85 91
86 script = "build-html.py" 92 script = "build-html.py"
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 args += [ 420 args += [
415 "--manifest_key", 421 "--manifest_key",
416 manifest_key, 422 manifest_key,
417 ] 423 ]
418 args += [ 424 args += [
419 "--app_client_id", 425 "--app_client_id",
420 app_client_id, 426 app_client_id,
421 ] 427 ]
422 } 428 }
423 } 429 }
OLDNEW
« no previous file with comments | « remoting/remoting_webapp_compile.gypi ('k') | third_party/closure_compiler/build/inputs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698