1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build,win: restore vcbuild TAG functionality

Browse Source 
--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: https://github.com/nodejs/node/pull/17299
Ref: https://github.com/nodejs/abi-stable-node/issues/289

PR-URL: https://github.com/nodejs/node/pull/18031
Ref: https://github.com/nodejs/node/pull/17299
Ref: https://github.com/nodejs/abi-stable-node/issues/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>
This commit is contained in:
Rod Vagg 2018-01-08 16:01:39 +11:00 committed by Michael Dawson
parent ee2e7fcd5f
commit b225970e6c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vcbuild.bat
View File

@ -158,7 +158,6 @@ if defined link_module set configure_flags=%configure_flags% %link_module%
if defined i18n_arg set configure_flags=%configure_flags% --with-intl=%i18n_arg%
if defined config_flags set configure_flags=%configure_flags% %config_flags%
if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%target_arch%
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
if not exist "%~dp0deps\icu" goto no-depsicu
if "%target%"=="Clean" echo deleting %~dp0deps\icu
@ -167,6 +166,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
call :getnodeversion || exit /b 1
if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
if "%target%"=="Clean" rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul
if defined noprojgen if defined nobuild if not defined sign if not defined msi goto licensertf