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. Backport-PR-URL: #14340 PR-URL: #13645 Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Alexey Orlenko <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Jul 18, 2017 · bb1b06a · bb1b06a
1 parent fcb27fa
commit bb1b06a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -780,7 +780,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=$$? ; \

diff --git a/vcbuild.bat b/vcbuild.bat
@@ -347,7 +347,7 @@ goto jslint
 :jslint
 if defined jslint_ci goto jslint-ci
 if not defined jslint goto exit
-if not exist tools\eslint\lib\eslint.js goto no-lint
+if not exist tools\eslint\bin\eslint.js goto no-lint
 echo running jslint
 %config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules benchmark lib test tools
 goto exit