@@ -83,6 +83,7 @@ if /i "%1"=="x64" set target_arch=x64&goto arg-ok
8383if /i " %1 " == " arm64" set target_arch = arm64& goto arg-ok
8484if /i " %1 " == " vs2017" set target_env = vs2017& goto arg-ok
8585if /i " %1 " == " vs2019" set target_env = vs2019& goto arg-ok
86+ if /i " %1 " == " vs2022" set target_env = vs2022& goto arg-ok
8687if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
8788if /i " %1 " == " projgen" set projgen = 1& goto arg-ok
8889if /i " %1 " == " nobuild" set nobuild = 1& goto arg-ok
@@ -178,6 +179,7 @@ set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp"
178179set " npm_exe = " %~dp0 %node_exe% " %~dp0 deps\npm\bin\npm-cli.js"
179180if " %target_env% " == " vs2017" set " node_gyp_exe = %node_gyp_exe% --msvs_version=2017"
180181if " %target_env% " == " vs2019" set " node_gyp_exe = %node_gyp_exe% --msvs_version=2019"
182+ if " %target_env% " == " vs2022" set " node_gyp_exe = %node_gyp_exe% --msvs_version=2022"
181183
182184:: skip building if the only argument received was lint
183185if " %* " == " lint" if exist " %node_exe% " goto lint-cpp
@@ -241,6 +243,46 @@ if %target_arch%==x64 if %msvs_host_arch%==amd64 set vcvarsall_arg=amd64
241243@ rem also if both are x86
242244if %target_arch% == x86 if %msvs_host_arch% == x86 set vcvarsall_arg = x86
243245
246+ @ rem Look for Visual Studio 2022
247+ :vs-set-2022
248+ if defined target_env if " %target_env% " NEQ " vs2022" goto vs-set-2019
249+ echo Looking for Visual Studio 2022
250+ @ rem VCINSTALLDIR may be set if run from a VS Command Prompt and needs to be
251+ @ rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to
252+ @ rem detect the version searched for
253+ if not defined target_env set " VCINSTALLDIR = "
254+ call tools\msvs\vswhere_usability_wrapper.cmd " [17.0,18.0)" " prerelease"
255+ if " _%VCINSTALLDIR% _" == " __" goto vs-set-2019
256+ set " WIXSDKDIR = %WIX% \SDK\VS2017"
257+ if defined msi (
258+ echo Looking for WiX installation for Visual Studio 2022...
259+ if not exist " %WIXSDKDIR% " (
260+ echo Failed to find WiX install for Visual Studio 2022
261+ echo VS2022 support for WiX is only present starting at version 3.XX
262+ goto vs-set-2019
263+ )
264+ if not exist " %VCINSTALLDIR% \..\MSBuild\Microsoft\WiX" (
265+ echo Failed to find the WiX Toolset Visual Studio 2022 Extension
266+ goto vs-set-2019
267+ )
268+ )
269+ @ rem check if VS2022 is already setup, and for the requested arch
270+ if " _%VisualStudioVersion% _" == " _17.0_" if " _%VSCMD_ARG_TGT_ARCH% _" == " _%target_arch% _" goto found_vs2022
271+ @ rem need to clear VSINSTALLDIR for vcvarsall to work as expected
272+ set " VSINSTALLDIR = "
273+ @ rem prevent VsDevCmd.bat from changing the current working directory
274+ set " VSCMD_START_DIR = %CD% "
275+ set vcvars_call = " %VCINSTALLDIR% \Auxiliary\Build\vcvarsall.bat" %vcvarsall_arg%
276+ echo calling: %vcvars_call%
277+ call %vcvars_call%
278+ if errorlevel 1 goto vs-set-2019
279+ if defined DEBUG_HELPER @ ECHO ON
280+ :found_vs2022
281+ echo Found MSVS version %VisualStudioVersion%
282+ set GYP_MSVS_VERSION = 2022
283+ set PLATFORM_TOOLSET = v143
284+ goto msbuild-found
285+
244286@ rem Look for Visual Studio 2019
245287:vs-set-2019
246288if defined target_env if " %target_env% " NEQ " vs2019" goto vs-set-2017
@@ -729,7 +771,7 @@ set exit_code=1
729771goto exit
730772
731773:help
732- 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] [vs2017/vs2019] [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]
774+ 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] [vs2017/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]
733775echo Examples:
734776echo vcbuild.bat : builds release build
735777echo vcbuild.bat debug : builds debug build
0 commit comments