diff --git a/.gitattributes b/.gitattributes index 82563e5d2fc..bbfe62e6a03 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ deps/npm/bin/npm text eol=lf deps/npm/bin/npx text eol=lf deps/corepack/shims/corepack text eol=lf tools/msvs/find_python.cmd text eol=crlf +doc/**/*.md text eol=lf diff --git a/vcbuild.bat b/vcbuild.bat index 122e6b86ecc..d288feb6151 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -48,6 +48,7 @@ set lint_js= set lint_cpp= set lint_md= set lint_md_build= +set format_md= set i18n_arg= set download_arg= set build_release= @@ -122,6 +123,7 @@ if /i "%1"=="lint-md" set lint_md=1&goto arg-ok if /i "%1"=="lint-md-build" set lint_md_build=1&goto arg-ok if /i "%1"=="lint" set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok if /i "%1"=="lint-ci" set lint_cpp=1&set lint_js_ci=1&goto arg-ok +if /i "%1"=="format-md" set format_md=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=full-icu&goto arg-ok if /i "%1"=="build-release" set build_release=1&set sign=1&goto arg-ok @@ -180,6 +182,9 @@ if "%target_env%"=="vs2022" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2022 :: skip building if the only argument received was lint if "%*"=="lint" if exist "%node_exe%" goto lint-cpp +:: skip building if the only argument received was format-md +if "%*"=="format-md" if exist "%node_exe%" goto format-md + if "%config%"=="Debug" set configure_flags=%configure_flags% --debug if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot if defined nonpm set configure_flags=%configure_flags% --without-npm @@ -653,6 +658,7 @@ if "%ERRORLEVEL%"=="0" set "NODEJS_MAKE=make PYTHON=python" & goto run-make-lint where wsl > NUL 2>&1 if "%ERRORLEVEL%"=="0" set "NODEJS_MAKE=wsl make" & goto run-make-lint echo Could not find GNU Make, needed for linting C/C++ +echo Alternatively, you can use WSL goto lint-js :run-make-lint @@ -677,7 +683,7 @@ echo "Deprecated no-op target 'lint_md_build'" goto lint-md :lint-md -if not defined lint_md goto exit +if not defined lint_md goto format-md echo Running Markdown linter on docs... SETLOCAL ENABLEDELAYEDEXPANSION set lint_md_files= @@ -688,10 +694,10 @@ for /D %%D IN (doc\*) do ( ) %node_exe% tools\lint-md\lint-md.mjs %lint_md_files% ENDLOCAL -goto exit +goto format-md :format-md -if not defined lint_md goto exit +if not defined format_md goto exit echo Running Markdown formatter on docs... SETLOCAL ENABLEDELAYEDEXPANSION set lint_md_files= @@ -711,7 +717,7 @@ set exit_code=1 goto exit :help -echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] +echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [format-md] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] echo Examples: echo vcbuild.bat : builds release build echo vcbuild.bat debug : builds debug build