From 5fb22e07d5e15cd801375ecd8e0c997729bb2cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20du=20Hamel?= Date: Sun, 5 Jan 2025 17:54:32 +0100 Subject: [PATCH 1/3] tools: fix `vcbuild test` when path contain spaces --- vcbuild.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcbuild.bat b/vcbuild.bat index 2ade326302ccea..b3381f90f07306 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -183,7 +183,7 @@ if defined package set stage_package=1 :: assign path to node_exe set "node_exe=%config%\node.exe" set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp" -set "npm_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npm-cli.js" +set "npm_exe="%~dp0%node_exe%" "%~dp0deps\npm\bin\npm-cli.js"" if "%target_env%"=="vs2022" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2022" if "%target_env%"=="vs2026" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2026" From a251a1206388674eea7fac99b29b25ea248c9b5b Mon Sep 17 00:00:00 2001 From: stduhpf Date: Sun, 5 Jan 2025 19:34:03 +0100 Subject: [PATCH 2/3] tools: fix vcbuild test whith consistent syntax Co-authored-by: Luigi Pinca --- vcbuild.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcbuild.bat b/vcbuild.bat index b3381f90f07306..b80c9b751cd8a2 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -183,7 +183,7 @@ if defined package set stage_package=1 :: assign path to node_exe set "node_exe=%config%\node.exe" set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp" -set "npm_exe="%~dp0%node_exe%" "%~dp0deps\npm\bin\npm-cli.js"" +set "npm_exe="%node_exe%" deps\npm\bin\npm-cli.js" if "%target_env%"=="vs2022" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2022" if "%target_env%"=="vs2026" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2026" From f1b58d26d66ed93072dc947deb9d4822fb588ce7 Mon Sep 17 00:00:00 2001 From: stduhpf Date: Sat, 6 Dec 2025 23:39:46 +0100 Subject: [PATCH 3/3] Apply suggestions --- vcbuild.bat | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index b80c9b751cd8a2..318f88569c2a5f 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -625,9 +625,7 @@ if not defined doc if not defined build_addons ( ) if exist "tools\doc\node_modules\unified\package.json" goto skip-install-doctools SETLOCAL -cd tools\doc -%npm_exe% ci -cd ..\.. +%npm_exe% --prefix tools\doc ci if errorlevel 1 goto exit ENDLOCAL :skip-install-doctools @@ -770,9 +768,7 @@ goto lint-js-build :lint-js-build if not defined lint_js_build if not defined lint_js if not defined lint_js_fix goto lint-md-build -cd tools\eslint -%npm_exe% ci -cd ..\.. +%npm_exe% --prefix tools\eslint ci :lint-js if not defined lint_js goto lint-js-fix @@ -790,9 +786,7 @@ goto lint-md-build :lint-md-build if not defined lint_md if not defined format_md goto lint-md -cd tools\lint-md -%npm_exe% ci -cd ..\.. +%npm_exe% --prefix tools\lint-md ci :lint-md if not defined lint_md goto format-md