Skip to content

Commit

Permalink
build,win: restore vcbuild TAG functionality
Browse files Browse the repository at this point in the history
--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>
  • Loading branch information
rvagg authored and kfarnung committed Jan 11, 2018
1 parent 28c0fd3 commit 560b195
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ if "%target_arch%"=="arm" (
)
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 defined engine set configure_flags=%configure_flags% --engine=%engine%

if not exist "%~dp0deps\icu" goto no-depsicu
Expand All @@ -191,6 +190,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
Expand Down

0 comments on commit 560b195

Please sign in to comment.