Commit 86bfdb5
authored
build: remove nocorepack vcbuild flag
PR-URL: #57772
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jordan Harband <ljharb@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>1 parent 77f88b9 commit 86bfdb5
4 files changed
Lines changed: 5 additions & 42 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,9 +22,6 @@ | |||
| 22 | 22 | <String Id="npm_Title" Value="npm package manager"/> | |
| 23 | 23 | <String Id="npm_Description" Value="Install npm, the recommended package manager for [ProductName]."/> | |
| 24 | 24 | ||
| 25 | - <String Id="corepack_Title" Value="corepack manager"/> | ||
| 26 | - <String Id="corepack_Description" Value="Install corepack, the universal package manager for [ProductName]."/> | ||
| 27 | - | ||
| 28 | 25 | <String Id="DocumentationShortcuts_Title" Value="Online documentation shortcuts"/> | |
| 29 | 26 | <String Id="DocumentationShortcuts_Description" Value="Add start menu entries that link the online documentation for [ProductName] [FullVersion] and the [ProductName] website."/> | |
| 30 | 27 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,31 +12,28 @@ | |||
| 12 | 12 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> | |
| 13 | 13 | <OutputPath>..\..\..\..\</OutputPath> | |
| 14 | 14 | <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> | ||
| 16 | 16 | <Cultures>en-US</Cultures> | |
| 17 | 17 | </PropertyGroup> | |
| 18 | 18 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> | |
| 19 | 19 | <OutputPath>..\..\..\..\</OutputPath> | |
| 20 | 20 | <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> | ||
| 22 | 22 | </PropertyGroup> | |
| 23 | 23 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|arm64' "> | |
| 24 | 24 | <OutputPath>..\..\..\..\</OutputPath> | |
| 25 | 25 | <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> | ||
| 27 | 27 | </PropertyGroup> | |
| 28 | 28 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|arm64' "> | |
| 29 | 29 | <OutputPath>..\..\..\..\</OutputPath> | |
| 30 | 30 | <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> | ||
| 32 | 32 | </PropertyGroup> | |
| 33 | 33 | <ItemGroup> | |
| 34 | 34 | <Compile Include="..\..\..\..\npm.wxs"> | |
| 35 | 35 | <Link>npm.wxs</Link> | |
| 36 | 36 | </Compile> | |
| 37 | - <Compile Include="..\..\..\..\corepack.wxs"> | ||
| 38 | - <Link>corepack.wxs</Link> | ||
| 39 | - </Compile> | ||
| 40 | 37 | </ItemGroup> | |
| 41 | 38 | <ItemGroup> | |
| 42 | 39 | <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" /> | |
@@ -50,8 +47,6 @@ | |||
| 50 | 47 | <Target Name="BeforeBuild"> | |
| 51 | 48 | <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"> | |
| 52 | 49 | </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> | ||
| 55 | 50 | </Target> | |
| 56 | 51 | <PropertyGroup> | |
| 57 | 52 | <PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -73,15 +73,6 @@ | |||
| 73 | 73 | <ComponentRef Id="SetInstallDirPermission" /> | |
| 74 | 74 | </Feature> | |
| 75 | 75 | ||
| 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 | - | ||
| 85 | 76 | <Feature Id="npm" | |
| 86 | 77 | Level="1" | |
| 87 | 78 | Title="!(loc.npm_Title)" | |
@@ -210,14 +201,6 @@ | |||
| 210 | 201 | </DirectoryRef> | |
| 211 | 202 | ||
| 212 | 203 | <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 | - | ||
| 221 | 204 | <Component Id="NpmCmdScript"> | |
| 222 | 205 | <File Id="npm.cmd" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npm.cmd"/> | |
| 223 | 206 | </Component> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,6 @@ set nobuild= | |||
| 33 | 33 | set sign= | |
| 34 | 34 | set nosnapshot= | |
| 35 | 35 | set nonpm= | |
| 36 | - set nocorepack= | ||
| 37 | 36 | set cctest_args= | |
| 38 | 37 | set test_args= | |
| 39 | 38 | set stage_package= | |
@@ -95,7 +94,6 @@ if /i "%1"=="nosign" set "sign="&echo Note: vcbuild no longer signs by de | |||
| 95 | 94 | if /i "%1"=="sign" set sign=1&goto arg-ok | |
| 96 | 95 | if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok | |
| 97 | 96 | if /i "%1"=="nonpm" set nonpm=1&goto arg-ok | |
| 98 | - if /i "%1"=="nocorepack" set nocorepack=1&goto arg-ok | ||
| 99 | 97 | if /i "%1"=="ltcg" set ltcg=1&goto arg-ok | |
| 100 | 98 | if /i "%1"=="licensertf" set licensertf=1&goto arg-ok | |
| 101 | 99 | 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 | |||
| 194 | 192 | if "%config%"=="Debug" set configure_flags=%configure_flags% --debug | |
| 195 | 193 | if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot | |
| 196 | 194 | if defined nonpm set configure_flags=%configure_flags% --without-npm | |
| 197 | - if defined nocorepack set configure_flags=%configure_flags% --without-corepack | ||
| 198 | 195 | if defined ltcg set configure_flags=%configure_flags% --with-ltcg | |
| 199 | 196 | if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase% | |
| 200 | 197 | if defined download_arg set configure_flags=%configure_flags% %download_arg% | |
@@ -458,15 +455,6 @@ if not defined nonpm ( | |||
| 458 | 455 | if errorlevel 1 echo Cannot copy npx.ps1 && goto package_error | |
| 459 | 456 | ) | |
| 460 | 457 | ||
| 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 | - | ||
| 470 | 458 | copy /Y ..\tools\msvs\nodevars.bat %TARGET_NAME%\ > nul | |
| 471 | 459 | if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error | |
| 472 | 460 | copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul | |
@@ -807,7 +795,7 @@ set exit_code=1 | |||
| 807 | 795 | goto exit | |
| 808 | 796 | ||
| 809 | 797 | :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] | ||
| 811 | 799 | echo Examples: | |
| 812 | 800 | echo vcbuild.bat : builds release build | |
| 813 | 801 | echo vcbuild.bat debug : builds debug build | |
0 commit comments