build: use generic names for linting tasks

"jslint" is the name of a tool that actually is not used, which can cause confusion. Backport-PR-URL: #16297 PR-URL: #15272 Reviewed-By: Roman Reiss <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Alexey Orlenko <[email protected]>

Author: seishun

Makefile

@@ -753,23 +753,27 @@ bench-idle:
  sleep 1
 $(NODE) benchmark/idle_clients.js &
 
-jslint:
+lint-js:
  @echo "Running JS linter..."
 $(NODE) tools/eslint/bin/eslint.js --cache --rulesdir=tools/eslint-rules --ext=.js,.md \
  benchmark doc lib test tools
 
-jslint-ci:
+jslint: lint-js
+
+lint-js-ci:
  @echo "Running JS linter..."
-$(NODE) tools/jslint.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
+$(NODE) tools/lint-js.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
  benchmark doc lib test tools
 
-CPPLINT_EXCLUDE ?=
-CPPLINT_EXCLUDE += src/node_root_certs.h
-CPPLINT_EXCLUDE += src/queue.h
-CPPLINT_EXCLUDE += src/tree.h
-CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
+jslint-ci: lint-js-ci
+
+LINT_CPP_EXCLUDE ?=
+LINT_CPP_EXCLUDE += src/node_root_certs.h
+LINT_CPP_EXCLUDE += src/queue.h
+LINT_CPP_EXCLUDE += src/tree.h
+LINT_CPP_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
 
-CPPLINT_FILES = $(filter-out$(CPPLINT_EXCLUDE), $(wildcard \
+LINT_CPP_FILES = $(filter-out$(LINT_CPP_EXCLUDE), $(wildcard \
  src/*.c \
  src/*.cc \
  src/*.h \
@@ -781,19 +785,21 @@ CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
  tools/icu/*.h \
  ))
 
-cpplint:
+lint-cpp:
  @echo "Running C++ linter..."
- @$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
+ @$(PYTHON) tools/cpplint.py $(LINT_CPP_FILES)
  @$(PYTHON) tools/check-imports.py
 
+cpplint: lint-cpp
+
 ifneq ("","$(wildcard tools/eslint/)")
 lint:
  @EXIT_STATUS=0 ;\
-$(MAKE)jslint|| EXIT_STATUS=$$?;\
-$(MAKE)cpplint|| EXIT_STATUS=$$?;\
+$(MAKE)lint-js|| EXIT_STATUS=$$?;\
+$(MAKE)lint-cpp|| EXIT_STATUS=$$?;\
 exit$$EXIT_STATUS
 CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
-lint-ci: jslint-ci cpplint
+lint-ci: lint-js-ci lint-cpp
  @if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
 &&! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" );then\
 exit 0 ;\
@@ -811,13 +817,13 @@ lint:
 lint-ci: lint
 endif
 
-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
+.PHONY: lint lint-cpp lint-js bench clean docopen docclean doc dist distclean \
  check uninstall install install-includes install-bin all staticlib \
  dynamiclib test test-all test-addons test-addons-clean build-addons \
  website-upload pkg blog blogclean tar binary release-only \
  bench-http-simple bench-idle bench-all bench bench-misc bench-array \
  bench-buffer bench-net bench-http bench-fs bench-tls cctest run-ci \
  test-v8 test-v8-intl test-v8-benchmarks test-v8-all v8 lint-ci \
- bench-ci jslint-ci doc-only $(TARBALL)-headers test-ci test-ci-native \
+ bench-ci lint-js-ci doc-only $(TARBALL)-headers test-ci test-ci-native \
  test-ci-js build-ci test-hash-seed clear-stalled
 

tools/jslint.js tools/lint-js.jstools/jslint.js renamed to tools/lint-js.js

@@ -59,7 +59,7 @@ if (cluster.isMaster){
 thrownewError('Bad parallel job count');
 }
 
-// Check for custom JSLint report formatter
+// Check for custom ESLint report formatter
 i=process.argv.indexOf('-f');
 if(i!==-1){
 if(!process.argv[i+1])
@@ -77,7 +77,7 @@ if (cluster.isMaster){
 formatter=cli.getFormatter();
 }
 
-// Check if outputting JSLint report to a file instead of stdout
+// Check if outputting ESLint report to a file instead of stdout
 i=process.argv.indexOf('-o');
 if(i!==-1){
 if(!process.argv[i+1])

vcbuild.bat

@@ -26,8 +26,8 @@ set package=
 setmsi=
 setupload=
 setlicensertf=
-setjslint=
-setcpplint=
+setlint_js=
+setlint_cpp=
 setbuildnodeweak=
 setnoetw=
 setnoetw_msi_arg=
@@ -58,7 +58,7 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
 if /i "%1"=="noetw"setnoetw=1&goto arg-ok
 if /i "%1"=="noperfctr"setnoperfctr=1&goto arg-ok
 if /i "%1"=="licensertf"setlicensertf=1&goto arg-ok
-if /i "%1"=="test"settest_args=%test_args% doctool known_issues message parallel sequential addons -J&set cpplint=1&set jslint=1&set build_addons=1&goto arg-ok
+if /i "%1"=="test"settest_args=%test_args% doctool known_issues message parallel sequential addons -J&set lint_cpp=1&set lint_js=1&set build_addons=1&goto arg-ok
 if /i "%1"=="test-ci"settest_args=%test_args%%test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons"settest_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-simple"settest_args=%test_args% sequential parallel -J&goto arg-ok
@@ -68,13 +68,16 @@ if /i "%1"=="test-inspector" set test_args=%test_args% inspector&goto arg-ok
 if /i "%1"=="test-tick-processor"settest_args=%test_args% tick-processor&goto arg-ok
 if /i "%1"=="test-internet"settest_args=%test_args% internet&goto arg-ok
 if /i "%1"=="test-pummel"settest_args=%test_args% pummel&goto arg-ok
-if /i "%1"=="test-all"settest_args=%test_args% sequential parallel message gc inspector internet pummel&set buildnodeweak=1&set cpplint=1&set jslint=1&goto arg-ok
+if /i "%1"=="test-all"settest_args=%test_args% sequential parallel message gc inspector internet pummel&set buildnodeweak=1&set lint_cpp=1&set lint_js=1&goto arg-ok
 if /i "%1"=="test-known-issues"settest_args=%test_args% known_issues&goto arg-ok
-if /i "%1"=="jslint"setjslint=1&goto arg-ok
-if /i "%1"=="jslint-ci"setjslint_ci=1&goto arg-ok
-if /i "%1"=="cpplint"setcpplint=1&goto arg-ok
-if /i "%1"=="lint"setcpplint=1&set jslint=1&goto arg-ok
-if /i "%1"=="lint-ci"setcpplint=1&set jslint_ci=1&goto arg-ok
+if /i "%1"=="lint-js"setlint_js=1&goto arg-ok
+if /i "%1"=="jslint"setlint_js=1&goto arg-ok
+if /i "%1"=="lint-js-ci"setlint_js_ci=1&goto arg-ok
+if /i "%1"=="jslint-ci"setlint_js_ci=1&goto arg-ok
+if /i "%1"=="lint-cpp"setlint_cpp=1&goto arg-ok
+if /i "%1"=="cpplint"setlint_cpp=1&goto arg-ok
+if /i "%1"=="lint"setlint_cpp=1&set lint_js=1&goto arg-ok
+if /i "%1"=="lint-ci"setlint_cpp=1&set lint_js_ci=1&goto arg-ok
 if /i "%1"=="package"setpackage=1&goto arg-ok
 if /i "%1"=="msi"setmsi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok
 if /i "%1"=="build-release"setbuild_release=1&goto arg-ok
@@ -340,23 +343,23 @@ endlocal
 goto run-tests
 
 :run-tests
-if"%test_args%"==""gotocpplint
+if"%test_args%"==""gotolint-cpp
 if"%config%"=="Debug"settest_args=--mode=debug %test_args%
 if"%config%"=="Release"settest_args=--mode=release %test_args%
 echo running 'cctest %cctest_args%'
 "%config%\cctest"%cctest_args%
 call :run-python tools\test.py %test_args%
-gotocpplint
+gotolint-cpp
 
-:cpplint
-ifnotdefinedcpplintgotojslint
-call :run-cpplint src\*.c src\*.cc src\*.h test\addons\*.cc test\addons\*.h test\cctest\*.cc test\cctest\*.h tools\icu\*.cc tools\icu\*.h
+:lint-cpp
+ifnotdefinedlint_cppgotolint-js
+call :run-lint-cpp src\*.c src\*.cc src\*.h test\addons\*.cc test\addons\*.h test\cctest\*.cc test\cctest\*.h tools\icu\*.cc tools\icu\*.h
 call :run-python tools/check-imports.py
-gotojslint
+gotolint-js
 
-:run-cpplint
+:run-lint-cpp
 if"%*"==""gotoexit
-echo running cpplint '%*'
+echo running lint-cpp '%*'
 setcppfilelist=
 setlocalenabledelayedexpansion
 for /f "tokens=*"%%Gin ('dir /b /s /a %*') do (
@@ -393,17 +396,17 @@ if %errorlevel% equ 0 goto exit
 set"localcppfilelist=%localcppfilelist%%1"
 gotoexit
 
-:jslint
-ifdefinedjslint_cigotojslint-ci
-ifnotdefinedjslintgotoexit
+:lint-js
+ifdefinedlint_js_cigotolint-js-ci
+ifnotdefinedlint_jsgotoexit
 ifnotexist tools\eslint goto no-lint
-echo running jslint
+echo running lint-js
 %config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
 gotoexit
 
-:jslint-ci
-echo running jslint-ci
-%config%\node tools\jslint.js -J -f tap -o test-eslint.tap benchmark doc lib test tools
+:lint-js-ci
+echo running lint-js-ci
+%config%\node tools\lint-js.js -J -f tap -o test-eslint.tap benchmark doc lib test tools
 gotoexit
 
 :no-lint