From 560b1951a413259982f63078b43d6cde5dca731f Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 8 Jan 2018 16:01:39 +1100 Subject: [PATCH] build,win: restore vcbuild TAG functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --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 Reviewed-By: JoãReis Reviewed-By: James M Snell Reviewed-By: Gibson Fahnestock Reviewed-By: Michael Dawson Reviewed-By: Kyle Farnung --- vcbuild.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vcbuild.bat b/vcbuild.bat index 38abb4eb296..0ece7298539 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -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 @@ -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