Skip to content

Commit b225970

Browse files
rvaggmhdawson
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: #17299 Ref: nodejs/abi-stable-node#289 PR-URL: #18031 Ref: #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 ee2e7fc commit b225970

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
@@ -158,7 +158,6 @@ if defined link_module set configure_flags=%configure_flags% %link_module%
158158
if defined i18n_arg set configure_flags=%configure_flags% --with-intl=%i18n_arg%
159159
if defined config_flags set configure_flags=%configure_flags% %config_flags%
160160
if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%target_arch%
161-
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
162161

163162
if not exist "%~dp0deps\icu" goto no-depsicu
164163
if "%target%"=="Clean" echo deleting %~dp0deps\icu
@@ -167,6 +166,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
167166

168167
call :getnodeversion || exit /b 1
169168

169+
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
170+
170171
if "%target%"=="Clean" rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul
171172

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

0 commit comments

Comments
 (0)