Skip to content

Commit

Permalink
build: enable small-icu support for build-release
Browse files Browse the repository at this point in the history
On Windows, when building the "build-release" rule, enable both small-icu
and download-all.

This change also slightly refactors the build-release rule, mainly so that
it's easier to read.

The resulting MSI package was tested on Windows 7.

Fixes nodejs#9099.

PR: nodejs#9100
PR-URL: nodejs/node-v0.x-archive#9100
Reviewed-By: Steven R. Loomis <srloomis@us.ibm.com>
Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
  • Loading branch information
Julien Gilli authored and tjfontaine committed Jan 26, 2015
1 parent ddd40fd commit e670732
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ set noperfctr_arg=
set noperfctr_msi_arg=
set i18n_arg=
set download_arg=
set build_release=

:next-arg
if "%1"=="" goto args-done
Expand Down Expand Up @@ -69,7 +70,7 @@ if /i "%1"=="small-icu" set i18n_arg=%1&goto arg-ok
if /i "%1"=="full-icu" set i18n_arg=%1&goto arg-ok
if /i "%1"=="intl-none" set i18n_arg=%1&goto arg-ok
if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok
if /i "%1"=="build-release" set nosnapshot=1&set config=Release&set msi=1&set licensertf=1&goto arg-ok
if /i "%1"=="build-release" set build_release=1&goto arg-ok

echo Warning: ignoring invalid command line option `%1`.

Expand All @@ -82,6 +83,15 @@ goto next-arg
if defined upload goto upload
if defined jslint goto jslint

if defined build_release (
set nosnapshot=1
set config=Release
set msi=1
set licensertf=1
set download_arg="--download=all"
set i18n_arg=small-icu
)

if "%config%"=="Debug" set debug_arg=--debug
if "%target_arch%"=="x64" set msiplatform=x64
if defined nosnapshot set nosnapshot_arg=--without-snapshot
Expand Down

0 comments on commit e670732

Please sign in to comment.