Skip to content

Commit bb1b06a

Browse files
TrottMylesBorins
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. 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]>
1 parent fcb27fa commit bb1b06a

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
@@ -780,7 +780,7 @@ cpplint:
780780
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
781781
@$(PYTHON) tools/check-imports.py
782782

783-
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
783+
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
784784
lint:
785785
@EXIT_STATUS=0 ; \
786786
$(MAKE) jslint || EXIT_STATUS=$$? ; \

vcbuild.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ goto jslint
347347
:jslint
348348
if defined jslint_ci goto jslint-ci
349349
if not defined jslint goto exit
350-
if not exist tools\eslint\lib\eslint.js goto no-lint
350+
if not exist tools\eslint\bin\eslint.js goto no-lint
351351
echo running jslint
352352
%config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules benchmark lib test tools
353353
goto exit

0 commit comments

Comments
 (0)