Skip to content

Commit 560b195

Browse files
rvaggkfarnung
authored andcommitted
build,win: restore vcbuild TAG functionality
--tag needs to be set after `getnodeversion` because TAG is defined in there when DISTTYPE is not "release", setting it before `getnodeversion` leads to --tag not being passed down in to `configure` and src/node_version.h setting it as `-pre` by default. This change restores the functionality that properly sets the TAG for nightlies, rc builds and other custom build types. Ref: nodejs/node#17299 Ref: nodejs/abi-stable-node#289 PR-URL: nodejs/node#18031 Ref: nodejs/node#17299 Ref: nodejs/abi-stable-node#289 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: JoãReis <reis@janeasystems.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
1 parent 28c0fd3 commit 560b195

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

vcbuild.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ if "%target_arch%"=="arm" (
181181
)
182182
if defined config_flags set configure_flags=%configure_flags% %config_flags%
183183
if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%target_arch%
184-
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
185184
if defined engine set configure_flags=%configure_flags% --engine=%engine%
186185

187186
if not exist "%~dp0deps\icu" goto no-depsicu
@@ -191,6 +190,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
191190

192191
call :getnodeversion || exit /b 1
193192

193+
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
194+
194195
if "%target%"=="Clean" rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul
195196

196197
if defined noprojgen if defined nobuild if not defined sign if not defined msi goto licensertf

0 commit comments

Comments
 (0)