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

Unified Diff: third_party/closure_compiler/checker.py

Issue 421253006: Add ChromeCodingConvention.java to Closure Compiler to preserve getInstance() type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@A_typechecking_about
Patch Set: rebase onto master Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/closure_compiler/coding_conventions_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/closure_compiler/checker.py
diff --git a/third_party/closure_compiler/checker.py b/third_party/closure_compiler/checker.py
index 26382ce64d3815bc39d6a82250c39122a9d3bd03..0f5c8ee79ea5d8d317178bed558fbf0e4d61ce50 100644
--- a/third_party/closure_compiler/checker.py
+++ b/third_party/closure_compiler/checker.py
@@ -19,7 +19,7 @@ class LineNumber(object):
class FileCache(object):
_cache = defaultdict(str)
-
+
def _read(self, file):
file = os.path.abspath(file)
self._cache[file] = self._cache[file] or open(file, "r").read()
@@ -128,10 +128,9 @@ class Checker(object):
if self._verbose:
print "(INFO) " + msg
- def _fatal(self, msg):
- print >> sys.stderr, "(FATAL) " + msg
+ def _error(self, msg):
+ print >> sys.stderr, "(ERROR) " + msg
self._clean_up()
- sys.exit(1)
def _run_command(self, cmd):
cmd_str = " ".join(cmd)
@@ -142,15 +141,15 @@ class Checker(object):
cmd_str, stdout=devnull, stderr=subprocess.PIPE, shell=True)
def _check_java_path(self):
- if self._found_java:
- return
+ if not self._found_java:
+ proc = self._run_command(["which", "java"])
+ proc.communicate()
+ if proc.returncode == 0:
+ self._found_java = True
+ else:
+ self._error("Cannot find java (`which java` => %s)" % proc.returncode)
- proc = self._run_command(["which", "java"])
- proc.communicate()
- if proc.returncode == 0:
- self._found_java = True
- else:
- self._fatal("Cannot find java (`which java` => %s)" % proc.returncode)
+ return self._found_java
def _run_jar(self, jar, args=[]):
self._check_java_path()
@@ -181,6 +180,9 @@ class Checker(object):
return tmp_file.name
def check(self, file, depends=[], externs=[]):
+ if not self._check_java_path():
+ return 1, ""
+
self._debug("FILE: " + file)
if file.endswith("_externs.js"):
@@ -216,10 +218,10 @@ class Checker(object):
output = self._format_errors(map(self._fix_up_error, errors))
if runner_cmd.returncode:
- self._fatal("Error in: " + file + ("\n" + output if output else ""))
+ self._error("Error in: " + file + ("\n" + output if output else ""))
elif output:
self._debug("Output: " + output)
-
+
self._clean_up()
- return runner_cmd.returncode == 0
+ return runner_cmd.returncode, output
« no previous file with comments | « no previous file | third_party/closure_compiler/coding_conventions_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698