Skip to content

Commit 67f87a7

Browse files
author
Julien Gilli
committedJan 15, 2015
build: add small-icu support for binary packages
Invokes the configure script used to build binary packages (OSX pkg, binary tarballs, pkgsrc, MSI) with --download=all --with-intl=small-icu. Also makes PACKAGEMAKER customizable, because PackageMaker is not necessarily installed in /Developer on OSX anymore. Tested all binary packages on Windows, OSX, Linux and SmartOS. Fixes nodejs#7676. Reviewed-by: Steven R. Loomis <srl@icu-project.org> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
1 parent 408bffe commit 67f87a7

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed
 

‎Makefile

+11-7
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ TARBALL=$(TARNAME).tar.gz
267267
BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
268268
BINARYTAR=$(BINARYNAME).tar.gz
269269
PKG=out/$(TARNAME).pkg
270-
packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
270+
PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
271271

272272
PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz
273273
ifdef NIGHTLY
@@ -305,10 +305,12 @@ pkg: $(PKG)
305305
$(PKG): release-only
306306
rm -rf $(PKGDIR)
307307
rm -rf out/deps out/Release
308-
$(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
308+
$(PYTHON) ./configure --download=all --with-intl=small-icu \
309+
--without-snapshot --dest-cpu=ia32 --tag=$(TAG)
309310
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
310311
rm -rf out/deps out/Release
311-
$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
312+
$(PYTHON) ./configure --download=all --with-intl=small-icu \
313+
--without-snapshot --dest-cpu=x64 --tag=$(TAG)
312314
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
313315
SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
314316
lipo $(PKGDIR)/32/usr/local/bin/node \
@@ -317,7 +319,7 @@ $(PKG): release-only
317319
-create
318320
mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
319321
rm -rf $(PKGDIR)/32
320-
$(packagemaker) \
322+
$(PACKAGEMAKER) \
321323
--id "org.nodejs.Node" \
322324
--doc tools/osx-pkg.pmdoc \
323325
--out $(PKG)
@@ -340,7 +342,8 @@ tar: $(TARBALL)
340342
$(BINARYTAR): release-only
341343
rm -rf $(BINARYNAME)
342344
rm -rf out/deps out/Release
343-
$(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
345+
$(PYTHON) ./configure --prefix=/ --download=all --with-intl=small-icu \
346+
--without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
344347
$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
345348
cp README.md $(BINARYNAME)
346349
cp LICENSE $(BINARYNAME)
@@ -353,8 +356,9 @@ binary: $(BINARYTAR)
353356

354357
$(PKGSRC): release-only
355358
rm -rf dist out
356-
$(PYTHON) configure --prefix=/ --without-snapshot \
357-
--dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
359+
$(PYTHON) configure --prefix=/ --without-snapshot --download=all \
360+
--with-intl=small-icu --dest-cpu=$(DESTCPU) --tag=$(TAG) \
361+
$(CONFIG_FLAGS)
358362
$(MAKE) install DESTDIR=dist
359363
(cd dist; find * -type f | sort) > packlist
360364
pkg_info -X pkg_install | \

‎vcbuild.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ if /i "%1"=="test-message" set test=test-message&goto arg-ok
6161
if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok
6262
if /i "%1"=="test-all" set test=test-all&set buildnodeweak=1&goto arg-ok
6363
if /i "%1"=="test" set test=test&goto arg-ok
64-
if /i "%1"=="msi" set msi=1&set licensertf=1&goto arg-ok
64+
@rem Include small-icu support with MSI installer
65+
if /i "%1"=="msi" set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok
6566
if /i "%1"=="upload" set upload=1&goto arg-ok
6667
if /i "%1"=="jslint" set jslint=1&goto arg-ok
6768
if /i "%1"=="small-icu" set i18n_arg=%1&goto arg-ok

0 commit comments

Comments
 (0)
Please sign in to comment.