Commit 674e75d
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 be3c8aa commit 674e75d
1 file changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -161,7 +161,6 @@ if defined link_module set configure_flags=%configure_flags% %link_module% | |||
| 161 | 161 | if defined i18n_arg set configure_flags=%configure_flags% --with-intl=%i18n_arg% | |
| 162 | 162 | if defined config_flags set configure_flags=%configure_flags% %config_flags% | |
| 163 | 163 | if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%target_arch% | |
| 164 | - if defined TAG set configure_flags=%configure_flags% --tag=%TAG% | ||
| 165 | 164 | ||
| 166 | 165 | if not exist "%~dp0deps\icu" goto no-depsicu | |
| 167 | 166 | if "%target%"=="Clean" echo deleting %~dp0deps\icu | |
@@ -170,6 +169,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu | |||
| 170 | 169 | ||
| 171 | 170 | call :getnodeversion || exit /b 1 | |
| 172 | 171 | ||
| 172 | + if defined TAG set configure_flags=%configure_flags% --tag=%TAG% | ||
| 173 | + | ||
| 173 | 174 | if "%target%"=="Clean" rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul | |
| 174 | 175 | ||
| 175 | 176 | if defined noprojgen if defined nobuild if not defined sign if not defined msi goto licensertf | |
0 commit comments