@@ -55,13 +55,14 @@ set http2_debug=
5555set nghttp2_debug =
5656set link_module =
5757set no_cctest =
58+ set cctest =
5859set openssl_no_asm =
5960set doc =
6061
6162:next-arg
6263if " %1 " == " " goto args-done
6364if /i " %1 " == " debug" set config = Debug& goto arg-ok
64- if /i " %1 " == " release" set config = Release& set ltcg=1& set " pch=" & goto arg-ok
65+ if /i " %1 " == " release" set config = Release& set ltcg=1& set " pch=" & set cctest=1 & goto arg-ok
6566if /i " %1 " == " clean" set target = Clean& goto arg-ok
6667if /i " %1 " == " ia32" set target_arch = x86& goto arg-ok
6768if /i " %1 " == " x86" set target_arch = x86& goto arg-ok
@@ -125,6 +126,7 @@ if /i "%1"=="no-NODE-OPTIONS" set no_NODE_OPTIONS=1&goto arg-ok
125126if /i " %1 " == " debug-nghttp2" set debug_nghttp2 = 1& goto arg-ok
126127if /i " %1 " == " link-module" set " link_module = --link-module=%2 %link_module% " & goto arg-ok-2
127128if /i " %1 " == " no-cctest" set no_cctest = 1& goto arg-ok
129+ if /i " %1 " == " cctest" set cctest = 1& goto arg-ok
128130if /i " %1 " == " openssl-no-asm" set openssl_no_asm = 1& goto arg-ok
129131if /i " %1 " == " doc" set doc = 1& goto arg-ok
130132
@@ -151,6 +153,7 @@ if defined build_release (
151153 set download_arg = " --download=all"
152154 set i18n_arg = small-icu
153155 set projgen = 1
156+ set cctest = 1
154157 set ltcg = 1
155158 set " pch = "
156159)
@@ -301,7 +304,12 @@ set "msbcpu=/m:2"
301304if " %NUMBER_OF_PROCESSORS% " == " 1" set " msbcpu = /m:1"
302305set " msbplatform = Win32"
303306if " %target_arch% " == " x64" set " msbplatform = x64"
304- if " %target% " == " Build" if defined no_cctest set target = node
307+ if " %target% " == " Build" (
308+ if defined no_cctest set target = rename_node_bin_win
309+ if " %test_args% " == " " set target = rename_node_bin_win
310+ if defined cctest set target = " Build"
311+ )
312+ if " %target% " == " rename_node_bin_win" if exist " %config% \cctest.exe" del " %config% \cctest.exe"
305313msbuild node.sln %msbcpu% /t:%target% /p:Configuration=%config% /p:Platform=%msbplatform% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
306314if errorlevel 1 (
307315 if not defined project_generated echo Building Node with reused solution failed. To regenerate project files use " vcbuild projgen"
@@ -533,7 +541,7 @@ if "%test_args%"=="" goto test-v8
533541if " %config% " == " Debug" set test_args = --mode=debug %test_args%
534542if " %config% " == " Release" set test_args = --mode=release %test_args%
535543if defined no_cctest echo Skipping cctest because no-cctest was specified && goto run-test-py
536- if not exist %config% \cctest.exe goto run-test-py
544+ if not exist " %config% \cctest.exe" echo cctest.exe not found. Run " vcbuild test " or " vcbuild cctest " to build it. && goto run-test-py
537545echo running 'cctest %cctest_args% '
538546" %config% \cctest" %cctest_args%
539547:run-test-py
@@ -635,7 +643,7 @@ del .used_configure_flags
635643goto exit
636644
637645:help
638- echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-addons-napi/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] [nopch] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [no-cctest] [openssl-no-asm]
646+ echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-addons-napi/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] [nopch] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/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]
639647echo Examples:
640648echo vcbuild.bat : builds release build
641649echo vcbuild.bat debug : builds debug build
0 commit comments