diff options
author | dbeam <dbeam@chromium.org> | 2015-03-25 11:25:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:26:40 +0000 |
commit | b59fe188aa76f3c18a71427c5e655aa609d7c7bd (patch) | |
tree | 91d58caa7f5d2dc92fa862a026fe2ac3e483aaa3 /remoting/remoting_webapp_compile.gypi | |
parent | ae0c69314c5c0025e8e6144f3a7fe64384087c77 (diff) | |
download | chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.zip chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.tar.gz chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.tar.bz2 |
Rework how remoting JS compilation GYP works.
There was an unfortunate bug that swallowed Java stacks.
Issues were discovered when Java stacks started surfacing:
https://codereview.chromium.org/476453002/
So change the way remoting is built. It doesn't need to be
built on all bots by default: they have undefined Java versions
and likely weren't working before (and shouldn't differ).
Instead, run when run_jscompile=1 is defined in GYP:
export GYP_DEFINES=run_jscompile=1 && build/gyp_chromium
# or add in ~/.gyp/includes.gypi or $SRC/../chromium.gyp_env
# or build/gyp_chromium -Drun_jscompile=1
and on the Closure Compilation Linux FYI bot:
http://build.chromium.org/p/chromium.fyi/builders/Closure%20Compilation%20Linux
This also fixes some GYP inputs problems (if I changed compile_js.gypi or
other things in remoting/ ninja wouldn't rebuild anything).
R=jamiewalch@chromium.org
BUG=none
TEST=green bots, remoting runs on Closure Compliation Linux FYI bot
Review URL: https://codereview.chromium.org/1037613002
Cr-Commit-Position: refs/heads/master@{#322193}
Diffstat (limited to 'remoting/remoting_webapp_compile.gypi')
-rw-r--r-- | remoting/remoting_webapp_compile.gypi | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/remoting/remoting_webapp_compile.gypi b/remoting/remoting_webapp_compile.gypi new file mode 100644 index 0000000..094ff92 --- /dev/null +++ b/remoting/remoting_webapp_compile.gypi @@ -0,0 +1,80 @@ +# 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. +# +# File in charge of Closure compiling remoting's webapp. + +{ + 'variables': { + 'success_stamp': '<(PRODUCT_DIR)/<(_target_name)_jscompile.stamp', + 'success_stamp_bt': '<(PRODUCT_DIR)/<(_target_name)_bt_jscompile.stamp', + 'success_stamp_ut': '<(PRODUCT_DIR)/<(_target_name)_ut_jscompile.stamp', + }, + 'actions': [ + { + 'action_name': 'Verify remoting webapp', + 'inputs': [ + 'remoting_webapp_compile.gypi', + 'remoting_webapp_files.gypi', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_js_proto_files)', + ], + 'outputs': [ + '<(success_stamp)', + ], + 'action': [ + 'python', '<(DEPTH)/third_party/closure_compiler/checker.py', + '--strict', + '--no-single-file', + '--success-stamp', '<(success_stamp)', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_js_proto_files)', + ], + }, + { + 'action_name': 'Verify remoting webapp with browsertests', + 'inputs': [ + 'remoting_webapp_compile.gypi', + 'remoting_webapp_files.gypi', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_browsertest_all_js_files)', + '<@(remoting_webapp_browsertest_js_proto_files)', + ], + 'outputs': [ + '<(success_stamp_bt)', + ], + 'action': [ + 'python', '<(DEPTH)/third_party/closure_compiler/checker.py', + '--strict', + '--no-single-file', + '--success-stamp', '<(success_stamp_bt)', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_browsertest_all_js_files)', + '<@(remoting_webapp_browsertest_js_proto_files)', + ], + }, + { + 'action_name': 'Verify remoting webapp unittests', + 'inputs': [ + 'remoting_webapp_compile.gypi', + 'remoting_webapp_files.gypi', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_unittests_all_js_files)', + '<@(remoting_webapp_unittests_js_proto_files)', + ], + 'outputs': [ + '<(success_stamp_ut)', + ], + 'action': [ + 'python', '<(DEPTH)/third_party/closure_compiler/checker.py', + '--strict', + '--no-single-file', + '--success-stamp', '<(success_stamp_ut)', + '<@(remoting_webapp_crd_js_files)', + '<@(remoting_webapp_unittests_all_js_files)', + '<@(remoting_webapp_unittests_js_proto_files)', + ], + }, + ], + 'includes': ['remoting_webapp_files.gypi'], +} |