Skip to content

Commit 86bfdb5

Browse files
aduh95aduh95
authored
build: remove nocorepack vcbuild flag
PR-URL: #57772 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Jordan Harband <[email protected]> Reviewed-By: Stefan Stojanovic <[email protected]>
1 parent 77f88b9 commit 86bfdb5

File tree

4 files changed

+5
-42
lines changed

4 files changed

+5
-42
lines changed

‎tools/msvs/msi/nodemsi/i18n/en-us.wxl

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
<String Id="npm_Title" Value="npm package manager"/>
2323
<String Id="npm_Description" Value="Install npm, the recommended package manager for [ProductName]."/>
2424

25-
<String Id="corepack_Title" Value="corepack manager"/>
26-
<String Id="corepack_Description" Value="Install corepack, the universal package manager for [ProductName]."/>
27-
2825
<String Id="DocumentationShortcuts_Title" Value="Online documentation shortcuts"/>
2926
<String Id="DocumentationShortcuts_Description" Value="Add start menu entries that link the online documentation for [ProductName] [FullVersion] and the [ProductName] website."/>
3027

‎tools/msvs/msi/nodemsi/nodemsi.wixproj

+4-9
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,28 @@
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
1313
<OutputPath>..\..\..\..\</OutputPath>
1414
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
15+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
1616
<Cultures>en-US</Cultures>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
1919
<OutputPath>..\..\..\..\</OutputPath>
2020
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
21-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
21+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|arm64' ">
2424
<OutputPath>..\..\..\..\</OutputPath>
2525
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
26-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
26+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|arm64' ">
2929
<OutputPath>..\..\..\..\</OutputPath>
3030
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
31-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
31+
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants>
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Compile Include="..\..\..\..\npm.wxs">
3535
<Link>npm.wxs</Link>
3636
</Compile>
37-
<Compile Include="..\..\..\..\corepack.wxs">
38-
<Link>corepack.wxs</Link>
39-
</Compile>
4037
</ItemGroup>
4138
<ItemGroup>
4239
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
@@ -50,8 +47,6 @@
5047
<Target Name="BeforeBuild">
5148
<HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\..\npm.wxs">
5249
</HeatDirectory>
53-
<HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack" PreprocessorVariable="var.CorepackSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="CorepackSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\..\corepack.wxs">
54-
</HeatDirectory>
5550
</Target>
5651
<PropertyGroup>
5752
<PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)"

‎tools/msvs/msi/nodemsi/product.wxs

-17
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,6 @@
7373
<ComponentRef Id="SetInstallDirPermission" />
7474
</Feature>
7575

76-
<Feature Id="corepack"
77-
Level="1"
78-
Title="!(loc.corepack_Title)"
79-
Description="!(loc.corepack_Description)">
80-
<ComponentRef Id="CorepackCmdScript"/>
81-
<ComponentRef Id="CorepackBashScript"/>
82-
<ComponentGroupRef Id="CorepackSourceFiles"/>
83-
</Feature>
84-
8576
<Feature Id="npm"
8677
Level="1"
8778
Title="!(loc.npm_Title)"
@@ -210,14 +201,6 @@
210201
</DirectoryRef>
211202

212203
<DirectoryRef Id="INSTALLDIR">
213-
<Component Id="CorepackCmdScript">
214-
<File Id="corepack.cmd" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\corepack.cmd"/>
215-
</Component>
216-
217-
<Component Id="CorepackBashScript">
218-
<File Id="corepack.sh" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\corepack"/>
219-
</Component>
220-
221204
<Component Id="NpmCmdScript">
222205
<File Id="npm.cmd" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npm.cmd"/>
223206
</Component>

‎vcbuild.bat

+1-13
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ set nobuild=
3333
set sign=
3434
set nosnapshot=
3535
set nonpm=
36-
set nocorepack=
3736
set cctest_args=
3837
set test_args=
3938
set stage_package=
@@ -95,7 +94,6 @@ if /i "%1"=="nosign" set "sign="&echo Note: vcbuild no longer signs by de
9594
if /i "%1"=="sign" set sign=1&goto arg-ok
9695
if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
9796
if /i "%1"=="nonpm" set nonpm=1&goto arg-ok
98-
if /i "%1"=="nocorepack" set nocorepack=1&goto arg-ok
9997
if /i "%1"=="ltcg" set ltcg=1&goto arg-ok
10098
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
10199
if /i "%1"=="test" set test_args=%test_args% %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
@@ -194,7 +192,6 @@ if "%*"=="format-md" if exist "%node_exe%" goto format-md
194192
if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
195193
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
196194
if defined nonpm set configure_flags=%configure_flags% --without-npm
197-
if defined nocorepack set configure_flags=%configure_flags% --without-corepack
198195
if defined ltcg set configure_flags=%configure_flags% --with-ltcg
199196
if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase%
200197
if defined download_arg set configure_flags=%configure_flags% %download_arg%
@@ -458,15 +455,6 @@ if not defined nonpm (
458455
if errorlevel 1 echo Cannot copy npx.ps1 && goto package_error
459456
)
460457

461-
if not defined nocorepack (
462-
robocopy ..\deps\corepack %TARGET_NAME%\node_modules\corepack /e /xd test > nul
463-
if errorlevel 8 echo Cannot copy corepack package && goto package_error
464-
copy /Y ..\deps\corepack\shims\nodewin\corepack %TARGET_NAME%\ > nul
465-
if errorlevel 1 echo Cannot copy corepack && goto package_error
466-
copy /Y ..\deps\corepack\shims\nodewin\corepack.cmd %TARGET_NAME%\ > nul
467-
if errorlevel 1 echo Cannot copy corepack.cmd && goto package_error
468-
)
469-
470458
copy /Y ..\tools\msvs\nodevars.bat %TARGET_NAME%\ > nul
471459
if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
472460
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
@@ -807,7 +795,7 @@ set exit_code=1
807795
goto exit
808796

809797
:help
810-
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] [clang-cl] [ccache path-to-ccache] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [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]
798+
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] [clang-cl] [ccache path-to-ccache] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [ltcg] [licensetf] [sign] [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]
811799
echo Examples:
812800
echo vcbuild.bat : builds release build
813801
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)