diff options
author | Nikolai Vavilov <vvnicholas@gmail.com> | 2017-09-08 14:44:58 +0300 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2017-09-24 12:31:52 -0300 |
commit | b2eb98721e54904a4de02bf8b040f3c81793bda0 (patch) | |
tree | c338fa9158bd87dbb8d672a5787397577a280833 /vcbuild.bat | |
parent | 3c777bb37f33b1fc6c6d1df4fe5a27d7519935fd (diff) | |
download | android-node-v8-b2eb98721e54904a4de02bf8b040f3c81793bda0.tar.gz android-node-v8-b2eb98721e54904a4de02bf8b040f3c81793bda0.tar.bz2 android-node-v8-b2eb98721e54904a4de02bf8b040f3c81793bda0.zip |
build: use generic names for linting tasks
"jslint" is the name of a tool that actually is not used, which can
cause confusion.
PR-URL: https://github.com/nodejs/node/pull/15272
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Diffstat (limited to 'vcbuild.bat')
-rw-r--r-- | vcbuild.bat | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 77a49edeb6..7601baf37d 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -26,8 +26,8 @@ set package= set msi= set upload= set licensertf= -set jslint= -set cpplint= +set lint_js= +set lint_cpp= set build_testgc_addon= set noetw= set noetw_msi_arg= @@ -72,7 +72,7 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok if /i "%1"=="noetw" set noetw=1&goto arg-ok if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok if /i "%1"=="licensertf" set licensertf=1&goto arg-ok -if /i "%1"=="test" set test_args=%test_args% -J %common_test_suites%&set cpplint=1&set jslint=1&goto arg-ok +if /i "%1"=="test" set test_args=%test_args% -J %common_test_suites%&set lint_cpp=1&set lint_js=1&goto arg-ok if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %common_test_suites%&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&goto arg-ok if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok if /i "%1"=="test-addons-napi" set test_args=%test_args% addons-napi&set build_addons_napi=1&goto arg-ok @@ -85,17 +85,19 @@ if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok if /i "%1"=="test-async-hooks" set test_args=%test_args% async-hooks&goto arg-ok -if /i "%1"=="test-all" set test_args=%test_args% gc internet pummel %common_test_suites%&set build_testgc_addon=1&set cpplint=1&set jslint=1&goto arg-ok +if /i "%1"=="test-all" set test_args=%test_args% gc internet pummel %common_test_suites%&set build_testgc_addon=1&set lint_cpp=1&set lint_js=1&goto arg-ok if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok if /i "%1"=="test-v8" set test_v8=1&set custom_v8_test=1&goto arg-ok if /i "%1"=="test-v8-intl" set test_v8_intl=1&set custom_v8_test=1&goto arg-ok if /i "%1"=="test-v8-benchmarks" set test_v8_benchmarks=1&set custom_v8_test=1&goto arg-ok if /i "%1"=="test-v8-all" set test_v8=1&set test_v8_intl=1&set test_v8_benchmarks=1&set custom_v8_test=1&goto arg-ok -if /i "%1"=="jslint" set jslint=1&goto arg-ok -if /i "%1"=="jslint-ci" set jslint_ci=1&goto arg-ok -if /i "%1"=="lint" set cpplint=1&set jslint=1&goto arg-ok -if /i "%1"=="lint-ci" set cpplint=1&set jslint_ci=1&goto arg-ok +if /i "%1"=="lint-js" set lint_js=1&goto arg-ok +if /i "%1"=="jslint" set lint_js=1&echo Please use lint-js instead of jslint&goto arg-ok +if /i "%1"=="lint-js-ci" set lint_js_ci=1&goto arg-ok +if /i "%1"=="jslint-ci" set lint_js_ci=1&echo Please use lint-js-ci instead of jslint-ci&goto arg-ok +if /i "%1"=="lint" set lint_cpp=1&set lint_js=1&goto arg-ok +if /i "%1"=="lint-ci" set lint_cpp=1&set lint_js_ci=1&goto arg-ok if /i "%1"=="package" set package=1&goto arg-ok if /i "%1"=="msi" set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok if /i "%1"=="build-release" set build_release=1&set sign=1&goto arg-ok @@ -457,20 +459,20 @@ if defined enable_static goto test-v8 call :run-python tools\test.py %test_args% :test-v8 -if not defined custom_v8_test goto cpplint +if not defined custom_v8_test goto lint-cpp call tools/test-v8.bat if errorlevel 1 goto exit -goto cpplint +goto lint-cpp -:cpplint -if not defined cpplint goto jslint -call :run-cpplint src\*.c src\*.cc src\*.h test\addons\*.cc test\addons\*.h test\cctest\*.cc test\cctest\*.h test\gc\binding.cc tools\icu\*.cc tools\icu\*.h +:lint-cpp +if not defined lint_cpp goto lint-js +call :run-lint-cpp src\*.c src\*.cc src\*.h test\addons\*.cc test\addons\*.h test\cctest\*.cc test\cctest\*.h test\gc\binding.cc tools\icu\*.cc tools\icu\*.h call :run-python tools/check-imports.py -goto jslint +goto lint-js -:run-cpplint +:run-lint-cpp if "%*"=="" goto exit -echo running cpplint '%*' +echo running lint-cpp '%*' set cppfilelist= setlocal enabledelayedexpansion for /f "tokens=*" %%G in ('dir /b /s /a %*') do ( @@ -501,18 +503,18 @@ if %errorlevel% equ 0 goto exit set "localcppfilelist=%localcppfilelist% %1" goto exit -:jslint +:lint-js if defined enable_static goto exit -if defined jslint_ci goto jslint-ci -if not defined jslint goto exit +if defined lint_js_ci goto lint-js-ci +if not defined lint_js goto exit if not exist 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 goto exit -: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 goto exit :no-lint |