Commit 0aaed24
build: add support for Visual Studio 2026
PR-URL: #60727
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>1 parent 6c2b75b commit 0aaed24
1 file changed
Lines changed: 30 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -86,6 +86,7 @@ if /i "%1"=="x86" set target_arch=x86&goto arg-ok | |||
| 86 | 86 | if /i "%1"=="x64" set target_arch=x64&goto arg-ok | |
| 87 | 87 | if /i "%1"=="arm64" set target_arch=arm64&goto arg-ok | |
| 88 | 88 | if /i "%1"=="vs2022" set target_env=vs2022&goto arg-ok | |
| 89 | + if /i "%1"=="vs2026" set target_env=vs2026&goto arg-ok | ||
| 89 | 90 | if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok | |
| 90 | 91 | if /i "%1"=="projgen" set projgen=1&goto arg-ok | |
| 91 | 92 | if /i "%1"=="clang-cl" set clang_cl=1&goto arg-ok | |
@@ -184,6 +185,7 @@ set "node_exe=%config%\node.exe" | |||
| 184 | 185 | set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp" | |
| 185 | 186 | set "npm_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npm-cli.js" | |
| 186 | 187 | if "%target_env%"=="vs2022" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2022" | |
| 188 | + if "%target_env%"=="vs2026" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2026" | ||
| 187 | 189 | ||
| 188 | 190 | :: skip building if the only argument received was lint | |
| 189 | 191 | if "%*"=="lint" if exist "%node_exe%" goto lint-cpp | |
@@ -266,6 +268,33 @@ set vcvarsall_arg=%msvs_host_arch%_%target_arch% | |||
| 266 | 268 | if %target_arch%==x64 if %msvs_host_arch%==amd64 set vcvarsall_arg=amd64 | |
| 267 | 269 | if %target_arch%==%msvs_host_arch% set vcvarsall_arg=%target_arch% | |
| 268 | 270 | ||
| 271 | + @rem Look for Visual Studio 2026 | ||
| 272 | + :vs-set-2026 | ||
| 273 | + if defined target_env if "%target_env%" NEQ "vs2026" goto msbuild-not-found | ||
| 274 | + echo Looking for Visual Studio 2026 | ||
| 275 | + @rem VCINSTALLDIR may be set if run from a VS Command Prompt and needs to be | ||
| 276 | + @rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to | ||
| 277 | + @rem detect the version searched for | ||
| 278 | + if not defined target_env set "VCINSTALLDIR=" | ||
| 279 | + call tools\msvs\vswhere_usability_wrapper.cmd "[18.0,19.0)" %target_arch% "prerelease" %clang_cl% | ||
| 280 | + if "_%VCINSTALLDIR%_" == "__" goto vs-set-2022 | ||
| 281 | + @rem check if VS2026 is already setup, and for the requested arch | ||
| 282 | + if "_%VisualStudioVersion%_" == "_18.0_" if "_%VSCMD_ARG_TGT_ARCH%_"=="_%target_arch%_" goto found_vs2026 | ||
| 283 | + @rem need to clear VSINSTALLDIR for vcvarsall to work as expected | ||
| 284 | + set "VSINSTALLDIR=" | ||
| 285 | + @rem prevent VsDevCmd.bat from changing the current working directory | ||
| 286 | + set "VSCMD_START_DIR=%CD%" | ||
| 287 | + set vcvars_call="%VCINSTALLDIR%\Auxiliary\Build\vcvarsall.bat" %vcvarsall_arg% | ||
| 288 | + echo calling: %vcvars_call% | ||
| 289 | + call %vcvars_call% | ||
| 290 | + if errorlevel 1 goto vs-set-2022 | ||
| 291 | + if defined DEBUG_HELPER @ECHO ON | ||
| 292 | + :found_vs2026 | ||
| 293 | + echo Found MSVS version %VisualStudioVersion% | ||
| 294 | + set GYP_MSVS_VERSION=2026 | ||
| 295 | + set PLATFORM_TOOLSET=v145 | ||
| 296 | + goto msbuild-found | ||
| 297 | + | ||
| 269 | 298 | @rem Look for Visual Studio 2022 | |
| 270 | 299 | :vs-set-2022 | |
| 271 | 300 | if defined target_env if "%target_env%" NEQ "vs2022" goto msbuild-not-found | |
@@ -806,7 +835,7 @@ set exit_code=1 | |||
| 806 | 835 | goto exit | |
| 807 | 836 | ||
| 808 | 837 | :help | |
| 809 | - 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] | ||
| 838 | + 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/vs2026] [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] | ||
| 810 | 839 | echo Examples: | |
| 811 | 840 | echo vcbuild.bat : builds release build | |
| 812 | 841 | echo vcbuild.bat debug : builds debug build | |
0 commit comments