Skip to content

Commit 2ce236e

Browse files
Trottaddaleax
authored andcommitted
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: #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]>
1 parent 70fb1bd commit 2ce236e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ cpplint:
903903
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
904904
@$(PYTHON) tools/check-imports.py
905905

906-
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
906+
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
907907
lint:
908908
@EXIT_STATUS=0 ; \
909909
$(MAKE) jslint || EXIT_STATUS=$$? ; \

vcbuild.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ goto exit
472472
:jslint
473473
if defined jslint_ci goto jslint-ci
474474
if not defined jslint goto exit
475-
if not exist tools\eslint\lib\eslint.js goto no-lint
475+
if not exist tools\eslint\bin\eslint.js goto no-lint
476476
echo running jslint
477477
%config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
478478
goto exit

0 commit comments

Comments
 (0)