Index: third_party/closure_compiler/checker.py |
diff --git a/third_party/closure_compiler/checker.py b/third_party/closure_compiler/checker.py |
index 2eb9e68a21f606fc41e3e6ba4859649483138d13..11f0a59a99c28cfe170b7fb8b9290f14d1757367 100755 |
--- a/third_party/closure_compiler/checker.py |
+++ b/third_party/closure_compiler/checker.py |
@@ -44,6 +44,7 @@ class Checker(object): |
"--jscomp_error=visibility", |
"--language_in=ECMASCRIPT5_STRICT", |
"--summary_detail_level=3", |
+ '--compilation_level=WHITESPACE_ONLY' |
] |
# These are the extra flags used when compiling in 'strict' mode. |
@@ -177,11 +178,19 @@ class Checker(object): |
tmp_file.write(contents) |
return tmp_file.name |
- def run_js_check(self, sources, externs=None): |
+ def run_js_check(self, sources, externs=None, out_file=None, |
+ generate_output=False, create_source_map=False): |
if not self._check_java_path(): |
return 1, "" |
args = ["--js=%s" % s for s in sources] |
+ |
+ if generate_output: |
+ args += ["--js_output_file=%s" % out_file] |
+ if create_source_map: |
Dan Beam
2015/03/06 02:57:28
i think we should always create source maps
Theresa
2015/03/06 03:07:18
Done.
|
+ args += ["--source_map_format=V3"] |
+ args += ["--create_source_map=%s.map" % out_file] |
+ |
if externs: |
args += ["--externs=%s" % e for e in externs] |
args_file_content = " %s" % " ".join(self._common_args() + args) |
@@ -201,7 +210,8 @@ class Checker(object): |
return errors, stderr |
- def check(self, source_file, depends=None, externs=None): |
+ def check(self, source_file, depends=None, externs=None, |
+ out_file=None, generate_output=False, create_source_map=False): |
"""Closure compile a file and check for errors. |
Args: |
@@ -240,7 +250,8 @@ class Checker(object): |
self._expanded_file = self._create_temp_file(self._processor.contents) |
self._debug("Expanded file: %s" % self._expanded_file) |
- errors, stderr = self.run_js_check([self._expanded_file], externs) |
+ errors, stderr = self.run_js_check([self._expanded_file], externs, |
+ out_file, generate_output, create_source_map) |
# Filter out false-positive promise chain errors. |
# See https://github.com/google/closure-compiler/issues/715 for details. |
@@ -284,6 +295,10 @@ if __name__ == "__main__": |
parser.add_argument("-d", "--depends", nargs=argparse.ZERO_OR_MORE) |
parser.add_argument("-e", "--externs", nargs=argparse.ZERO_OR_MORE) |
parser.add_argument("-o", "--out_file", help="A place to output results") |
+ parser.add_argument("-g", "--generate_output", |
+ help="Whether or not an output file should be generated") |
+ parser.add_argument("-c", "--configuration_name", |
+ help="The build configuration") |
parser.add_argument("-v", "--verbose", action="store_true", |
help="Show more information as this script runs") |
parser.add_argument("--strict", action="store_true", |
@@ -297,6 +312,20 @@ if __name__ == "__main__": |
depends = opts.depends or [] |
externs = opts.externs or set() |
+ generate_output = False if (opts.generate_output == '0') else True |
+ create_source_map = True |
+ if opts.configuration_name == 'Release' or not generate_output: |
+ create_source_map = False |
+ |
+ # Clean up intermediate folders that get created by output.py or create the dirs if needed |
+ out_dir = os.path.dirname(opts.out_file) |
+ if not generate_output: |
+ if os.path.exists(out_dir) and os.listdir(out_dir) == []: |
+ os.removedirs(out_dir) |
+ else: |
+ if not os.path.exists(out_dir): |
+ os.makedirs(out_dir) |
+ |
checker = Checker(verbose=opts.verbose, strict=opts.strict) |
if opts.single_file: |
for source in opts.sources: |
@@ -304,16 +333,12 @@ if __name__ == "__main__": |
source, |
depends, |
externs) |
- has_errors, _ = checker.check(source, depends=depends, externs=externs) |
+ has_errors, _ = checker.check(source, depends=depends, externs=externs, |
+ out_file=opts.out_file, generate_output=generate_output, |
+ create_source_map=create_source_map) |
if has_errors: |
sys.exit(1) |
- if opts.out_file: |
- out_dir = os.path.dirname(opts.out_file) |
- if not os.path.exists(out_dir): |
- os.makedirs(out_dir) |
- # TODO(dbeam): write compiled file to |opts.out_file|. |
- open(opts.out_file, "w").write("") |
else: |
has_errors, errors = checker.check_multiple(opts.sources) |
if has_errors: |