Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8d892f5

Browse filesBrowse files
RaisinTendanielleadams
authored andcommitted
build: add nonpm and nocorepack to vcbuild.bat
The `./configure` script allows you to produce a build without npm and corepack with the `--without-npm` and `--without-corepack` options respectively, so this change adds the same capability to the `vcbuild.bat` script. Signed-off-by: Darshan Sen <raisinten@gmail.com> PR-URL: #43219 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 5e65c1f commit 8d892f5
Copy full SHA for 8d892f5

File tree

Expand file treeCollapse file tree

1 file changed

+30
-17
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+30
-17
lines changed
Open diff view settings
Collapse file

‎vcbuild.bat‎

Copy file name to clipboardExpand all lines: vcbuild.bat
+30-17Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ set projgen=
3535
set nobuild=
3636
set sign=
3737
set nosnapshot=
38+
set nonpm=
39+
set nocorepack=
3840
set cctest_args=
3941
set test_args=
4042
set stage_package=
@@ -89,6 +91,8 @@ if /i "%1"=="nobuild" set nobuild=1&goto arg-ok
8991
if /i "%1"=="nosign" set "sign="&echo Note: vcbuild no longer signs by default. "nosign" is redundant.&goto arg-ok
9092
if /i "%1"=="sign" set sign=1&goto arg-ok
9193
if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
94+
if /i "%1"=="nonpm" set nonpm=1&goto arg-ok
95+
if /i "%1"=="nocorepack" set nocorepack=1&goto arg-ok
9296
if /i "%1"=="noetw" set noetw=1&goto arg-ok
9397
if /i "%1"=="ltcg" set ltcg=1&goto arg-ok
9498
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
@@ -184,6 +188,8 @@ if "%*"=="lint" if exist "%node_exe%" goto lint-cpp
184188

185189
if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
186190
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
191+
if defined nonpm set configure_flags=%configure_flags% --without-npm
192+
if defined nocorepack set configure_flags=%configure_flags% --without-corepack
187193
if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
188194
if defined ltcg set configure_flags=%configure_flags% --with-ltcg
189195
if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase%
@@ -444,22 +450,29 @@ copy /Y ..\README.md %TARGET_NAME%\ > nul
444450
if errorlevel 1 echo Cannot copy README.md && goto package_error
445451
copy /Y ..\CHANGELOG.md %TARGET_NAME%\ > nul
446452
if errorlevel 1 echo Cannot copy CHANGELOG.md && goto package_error
447-
robocopy ..\deps\npm %TARGET_NAME%\node_modules\npm /e /xd test > nul
448-
if errorlevel 8 echo Cannot copy npm package && goto package_error
449-
robocopy ..\deps\corepack %TARGET_NAME%\node_modules\corepack /e /xd test > nul
450-
if errorlevel 8 echo Cannot copy corepack package && goto package_error
451-
copy /Y ..\deps\npm\bin\npm %TARGET_NAME%\ > nul
452-
if errorlevel 1 echo Cannot copy npm && goto package_error
453-
copy /Y ..\deps\npm\bin\npm.cmd %TARGET_NAME%\ > nul
454-
if errorlevel 1 echo Cannot copy npm.cmd && goto package_error
455-
copy /Y ..\deps\npm\bin\npx %TARGET_NAME%\ > nul
456-
if errorlevel 1 echo Cannot copy npx && goto package_error
457-
copy /Y ..\deps\npm\bin\npx.cmd %TARGET_NAME%\ > nul
458-
if errorlevel 1 echo Cannot copy npx.cmd && goto package_error
459-
copy /Y ..\deps\corepack\shims\nodewin\corepack %TARGET_NAME%\ > nul
460-
if errorlevel 1 echo Cannot copy corepack && goto package_error
461-
copy /Y ..\deps\corepack\shims\nodewin\corepack.cmd %TARGET_NAME%\ > nul
462-
if errorlevel 1 echo Cannot copy corepack.cmd && goto package_error
453+
454+
if not defined nonpm (
455+
robocopy ..\deps\npm %TARGET_NAME%\node_modules\npm /e /xd test > nul
456+
if errorlevel 8 echo Cannot copy npm package && goto package_error
457+
copy /Y ..\deps\npm\bin\npm %TARGET_NAME%\ > nul
458+
if errorlevel 1 echo Cannot copy npm && goto package_error
459+
copy /Y ..\deps\npm\bin\npm.cmd %TARGET_NAME%\ > nul
460+
if errorlevel 1 echo Cannot copy npm.cmd && goto package_error
461+
copy /Y ..\deps\npm\bin\npx %TARGET_NAME%\ > nul
462+
if errorlevel 1 echo Cannot copy npx && goto package_error
463+
copy /Y ..\deps\npm\bin\npx.cmd %TARGET_NAME%\ > nul
464+
if errorlevel 1 echo Cannot copy npx.cmd && goto package_error
465+
)
466+
467+
if not defined nocorepack (
468+
robocopy ..\deps\corepack %TARGET_NAME%\node_modules\corepack /e /xd test > nul
469+
if errorlevel 8 echo Cannot copy corepack package && goto package_error
470+
copy /Y ..\deps\corepack\shims\nodewin\corepack %TARGET_NAME%\ > nul
471+
if errorlevel 1 echo Cannot copy corepack && goto package_error
472+
copy /Y ..\deps\corepack\shims\nodewin\corepack.cmd %TARGET_NAME%\ > nul
473+
if errorlevel 1 echo Cannot copy corepack.cmd && goto package_error
474+
)
475+
463476
copy /Y ..\tools\msvs\nodevars.bat %TARGET_NAME%\ > nul
464477
if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
465478
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
@@ -759,7 +772,7 @@ set exit_code=1
759772
goto exit
760773

761774
:help
762-
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/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] [noetw] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [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]
775+
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/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] [noetw] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2019/vs2022] [download-all] [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]
763776
echo Examples:
764777
echo vcbuild.bat : builds release build
765778
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.