diff options
| author | Rod Vagg <rod@vagg.org> | 2018-01-08 16:01:39 +1100 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2018-01-11 16:49:52 -0500 |
| commit | b225970e6ca05cab568273b100c5967b4209f621 (patch) | |
| tree | 6181c41356f452a1afcad7a255b01f279a77ac36 /vcbuild.bat | |
| parent | ee2e7fcd5ff330f036f6502cded21eb013941f89 (diff) | |
| download | android-node-v8-b225970e6ca05cab568273b100c5967b4209f621.tar.gz android-node-v8-b225970e6ca05cab568273b100c5967b4209f621.tar.bz2 android-node-v8-b225970e6ca05cab568273b100c5967b4209f621.zip | |
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: 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>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 796508d23b..409df48b4c 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -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 |