Skip to content

Commit

Permalink
build: fixing lint issues
Browse files Browse the repository at this point in the history
* Moved the chakra_jslint set to the engine handler, as it stands it
  will only get invoked if the engine is passed specifically.
* Fixed two jslint issues
* Removed duplicate "inspector" from the "test-ci" handler

PR-URL: nodejs#253
Reviewed-By: Kunal Pathak <Kunal.Pathak@microsoft.com>
  • Loading branch information
kfarnung committed May 23, 2017
1 parent 7d8f8f9 commit d75d283
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ 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% doctool known_issues message parallel sequential addons addons-napi inspector -J&set cpplint=1&set jslint=1&set build_addons=1&set build_addons_napi=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons addons-napi inspector&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&set build_addons_napi=1&goto arg-ok
if /i "%1"=="test" set test_args=%test_args% doctool inspector known_issues message parallel sequential addons addons-napi -J&set cpplint=1&set jslint=1&set build_addons=1&set build_addons_napi=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons addons-napi&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&set build_addons_napi=1&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
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
Expand Down Expand Up @@ -100,7 +100,7 @@ if /i "%1"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
if /i "%1"=="dll" set dll=1&goto arg-ok
if /i "%1"=="static" set enable_static=1&goto arg-ok
if /i "%1"=="v8" set engine=v8&goto arg-ok
if /i "%1"=="chakracore" set engine=chakracore&set chakra_jslint=deps\chakrashim\lib&goto arg-ok
if /i "%1"=="chakracore" set engine=chakracore&goto arg-ok
if /i "%1"=="no-NODE-OPTIONS" set no_NODE_OPTIONS=1&goto arg-ok

echo Error: invalid command line option `%1`.
Expand Down Expand Up @@ -141,7 +141,7 @@ if "%i18n_arg%"=="full-icu" set configure_flags=%configure_flags% --with-intl=fu
if "%i18n_arg%"=="small-icu" set configure_flags=%configure_flags% --with-intl=small-icu
if "%i18n_arg%"=="intl-none" set configure_flags=%configure_flags% --with-intl=none
if "%i18n_arg%"=="without-intl" set configure_flags=%configure_flags% --without-intl
if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-bundled-v8
if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-bundled-v8&set chakra_jslint=deps\chakrashim\lib

if defined config_flags set configure_flags=%configure_flags% %config_flags%

Expand Down

0 comments on commit d75d283

Please sign in to comment.