@@ -18,7 +18,7 @@ set target_arch=x86
18
18
set target_env =
19
19
set noprojgen =
20
20
set nobuild =
21
- set nosign =
21
+ set sign =
22
22
set nosnapshot =
23
23
set cctest_args =
24
24
set test_args =
@@ -51,7 +51,8 @@ if /i "%1"=="x64" set target_arch=x64&goto arg-ok
51
51
if /i " %1 " == " vc2015" set target_env = vc2015& goto arg-ok
52
52
if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
53
53
if /i " %1 " == " nobuild" set nobuild = 1& goto arg-ok
54
- if /i " %1 " == " nosign" set nosign = 1& goto arg-ok
54
+ if /i " %1 " == " nosign" set " sign = " & goto arg-ok
55
+ if /i " %1 " == " sign" set sign = 1& goto arg-ok
55
56
if /i " %1 " == " nosnapshot" set nosnapshot = 1& goto arg-ok
56
57
if /i " %1 " == " noetw" set noetw = 1& goto arg-ok
57
58
if /i " %1 " == " noperfctr" set noperfctr = 1& goto arg-ok
@@ -72,7 +73,7 @@ if /i "%1"=="jslint" set jslint=1&goto arg-ok
72
73
if /i " %1 " == " jslint-ci" set jslint_ci = 1& goto arg-ok
73
74
if /i " %1 " == " package" set package = 1& goto arg-ok
74
75
if /i " %1 " == " msi" set msi = 1& set licensertf=1& set download_arg=" --download=all" & set i18n_arg=small-icu& goto arg-ok
75
- if /i " %1 " == " build-release" set build_release = 1& goto arg-ok
76
+ if /i " %1 " == " build-release" set build_release = 1& set sign=1 & goto arg-ok
76
77
if /i " %1 " == " upload" set upload = 1& goto arg-ok
77
78
if /i " %1 " == " small-icu" set i18n_arg = %1 & goto arg-ok
78
79
if /i " %1 " == " full-icu" set i18n_arg = %1 & goto arg-ok
@@ -130,7 +131,7 @@ call :getnodeversion || exit /b 1
130
131
131
132
if " %target% " == " Clean" rmdir /Q /S " %~dp0 %config% \node-v%FULLVERSION% -win-%target_arch% " > nul 2 > nul
132
133
133
- if defined noprojgen if defined nobuild if defined nosign if not defined msi goto licensertf
134
+ if defined noprojgen if defined nobuild if not defined sign if not defined msi goto licensertf
134
135
135
136
@ rem Set environment for msbuild
136
137
@@ -189,8 +190,8 @@ if errorlevel 1 goto exit
189
190
if " %target% " == " Clean" goto exit
190
191
191
192
:sign
192
- @ rem Skip signing if the `nosign ` option was specified.
193
- if defined nosign goto licensertf
193
+ @ rem Skip signing unless the `sign ` option was specified.
194
+ if not defined sign goto licensertf
194
195
195
196
call tools\sign.bat Release\node.exe
196
197
if errorlevel 1 echo Failed to sign exe& goto exit
@@ -269,7 +270,7 @@ echo Building node-v%FULLVERSION%-%target_arch%.msi
269
270
msbuild " %~dp0 tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:PlatformToolset=%PLATFORM_TOOLSET% /p:GypMsvsVersion=%GYP_MSVS_VERSION% /p:Configuration=%config% /p:Platform=%target_arch% /p:NodeVersion=%NODE_VERSION% /p:FullVersion=%FULLVERSION% /p:DistTypeDir=%DISTTYPEDIR% %noetw_msi_arg% %noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
270
271
if errorlevel 1 goto exit
271
272
272
- if defined nosign goto upload
273
+ if not defined sign goto upload
273
274
call tools\sign.bat node-v%FULLVERSION% -%target_arch% .msi
274
275
if errorlevel 1 echo Failed to sign msi& goto exit
275
276
@@ -364,7 +365,7 @@ echo Failed to create vc project files.
364
365
goto exit
365
366
366
367
:help
367
- echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [nosign ] [x86/x64] [vc2015] [download-all] [enable-vtune]
368
+ echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign ] [x86/x64] [vc2015] [download-all] [enable-vtune]
368
369
echo Examples:
369
370
echo vcbuild.bat : builds release build
370
371
echo vcbuild.bat debug : builds debug build
0 commit comments