Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2017-06-15 23:53:42 +0300
committerAnna Henningsen <anna@addaleax.net>2017-06-21 23:43:31 +0300
commit2ce236e1739277788af6a353d0a4c845d45515ea (patch)
tree122fd6271937a09509457afbdfdebb3ad8f77822 /Makefile
parent70fb1bd038808617e317532aa88573451e44ce26 (diff)
build: check for linter in bin rather than lib
Make the "can we lint?" check in Makefile and vcbuild.bat depend on bin/eslint.js rather than lib/eslint.js. In ESLint 4.0.0, lib/eslint.js is not present. The lint rules call bin/eslint.js so check for that instead. PR-URL: https://github.com/nodejs/node/pull/13645 Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1aa317c88f0..ae4925af0c9 100644
--- a/Makefile
+++ b/Makefile
@@ -903,7 +903,7 @@ cpplint:
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
@$(PYTHON) tools/check-imports.py
-ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
+ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
lint:
@EXIT_STATUS=0 ; \
$(MAKE) jslint || EXIT_STATUS=$$? ; \