build: add cpp linting to windows build

This PR adds cpp linting to windows build script. After this change,
running command `vcbuild lint` will run both cpp linting and javascript
linting on a windows machine.
Backport-PR-URL: #14879
PR-URL: #11856Fixes: #11816
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Author: liusi

CONTRIBUTING.md

@@ -176,7 +176,8 @@ Running `make test`/`vcbuild test` will run the linter as well unless one or
 more tests fail.
 
 If you want to run the linter without running tests, use
-`make lint`/`vcbuild lint`.
+`make lint`/`vcbuild lint`. It will run both JavaScript linting and
+C++ linting.
 
 If you are updating tests and just want to run a single test to check it, you
 can use this syntax to run it exactly as the test harness would:

tools/cpplint.py

@@ -1074,7 +1074,8 @@ def RepositoryName(self):
  """
 fullname=self.FullName()
 # XXX(bnoordhuis) Expects that cpplint.py lives in the tools/ directory.
-toplevel=os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+toplevel=os.path.abspath(
+os.path.join(os.path.dirname(__file__), '..')).replace('\\', '/')
 prefix=os.path.commonprefix([fullname, toplevel])
 returnfullname[len(prefix) +1:]
 

vcbuild.bat

@@ -27,6 +27,7 @@ set msi=
 setupload=
 setlicensertf=
 setjslint=
+setcpplint=
 setbuildnodeweak=
 setnoetw=
 setnoetw_msi_arg=
@@ -57,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 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 cpplint=1&set jslint=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
@@ -67,10 +68,12 @@ 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 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 cpplint=1&set jslint=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"=="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"=="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
@@ -323,25 +326,67 @@ for /d %%F in (test\addons\??_*) do (
 "%node_exe%" tools\doc\addon-verify.js
 if%errorlevel%neq0exit /b %errorlevel%
 :: building addons
-SetLocalEnableDelayedExpansion
+setlocalEnableDelayedExpansion
 for /d %%Fin (test\addons\*) do (
 "%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild ^
  --directory="%%F"^
  --nodedir="%cd%"
 if!errorlevel!neq0exit /b !errorlevel!
 )
-EndLocal
+endlocal
 goto run-tests
 
 :run-tests
-if"%test_args%"==""gotojslint
+if"%test_args%"==""gotocpplint
 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%
+goto cpplint
+
+:cpplint
+ifnotdefined cpplint goto jslint
+echo running cpplint
+setcppfilelist=
+setlocalenabledelayedexpansion
+for /f "tokens=*"%%Gin ('dir /b /s /a 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') do (
+setrelpath=%%G
+setrelpath=!relpath:*%~dp0=!
+call :add-to-list!relpath!
+)
+( endlocal
+setcppfilelist=%localcppfilelist%
+)
+python tools/cpplint.py %cppfilelist%
+python tools/check-imports.py
 goto jslint
 
+:add-to-list
+echo%1|findstr /c:"src\node_root_certs.h"
+if%errorlevel%equ0gotoexit
+
+echo%1|findstr /c:"src\queue.h"
+if%errorlevel%equ0gotoexit
+
+echo%1|findstr /c:"src\tree.h"
+if%errorlevel%equ0gotoexit
+
+@rem skip subfolders under /src
+echo%1|findstr /r /c:"src\\.*\\.*"
+if%errorlevel%equ0gotoexit
+
+echo%1|findstr /r /c:"test\\addons\\[0-9].*_.*\.h"
+if%errorlevel%equ0gotoexit
+
+echo%1|findstr /r /c:"test\\addons\\[0-9].*_.*\.cc"
+if%errorlevel%equ0gotoexit
+
+set"localcppfilelist=%localcppfilelist%%1"
+gotoexit
+
 :jslint
 ifdefined jslint_ci goto jslint-ci
 ifnotdefined jslint gotoexit