diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-01-06 17:01:40 -0800 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-01-14 17:41:21 -0800 |
| commit | 67f87a743dee4951374dd240c25e31cd507e6c5f (patch) | |
| tree | 423bc501c491da9ef100b4c29b0d7146d1dd008d | |
| parent | 408bffe212c350a56218e3562e5315da65235a2f (diff) | |
| download | node-67f87a743dee4951374dd240c25e31cd507e6c5f.tar.gz | |
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 #7676.
Reviewed-by: Steven R. Loomis <srl@icu-project.org>
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | vcbuild.bat | 3 |
2 files changed, 13 insertions, 8 deletions
@@ -267,7 +267,7 @@ TARBALL=$(TARNAME).tar.gz BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH) BINARYTAR=$(BINARYNAME).tar.gz PKG=out/$(TARNAME).pkg -packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker +PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz ifdef NIGHTLY @@ -305,10 +305,12 @@ pkg: $(PKG) $(PKG): release-only rm -rf $(PKGDIR) rm -rf out/deps out/Release - $(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG) + $(PYTHON) ./configure --download=all --with-intl=small-icu \ + --without-snapshot --dest-cpu=ia32 --tag=$(TAG) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32 rm -rf out/deps out/Release - $(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG) + $(PYTHON) ./configure --download=all --with-intl=small-icu \ + --without-snapshot --dest-cpu=x64 --tag=$(TAG) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR) SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh lipo $(PKGDIR)/32/usr/local/bin/node \ @@ -317,7 +319,7 @@ $(PKG): release-only -create mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node rm -rf $(PKGDIR)/32 - $(packagemaker) \ + $(PACKAGEMAKER) \ --id "org.nodejs.Node" \ --doc tools/osx-pkg.pmdoc \ --out $(PKG) @@ -340,7 +342,8 @@ tar: $(TARBALL) $(BINARYTAR): release-only rm -rf $(BINARYNAME) rm -rf out/deps out/Release - $(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS) + $(PYTHON) ./configure --prefix=/ --download=all --with-intl=small-icu \ + --without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS) $(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1 cp README.md $(BINARYNAME) cp LICENSE $(BINARYNAME) @@ -353,8 +356,9 @@ binary: $(BINARYTAR) $(PKGSRC): release-only rm -rf dist out - $(PYTHON) configure --prefix=/ --without-snapshot \ - --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS) + $(PYTHON) configure --prefix=/ --without-snapshot --download=all \ + --with-intl=small-icu --dest-cpu=$(DESTCPU) --tag=$(TAG) \ + $(CONFIG_FLAGS) $(MAKE) install DESTDIR=dist (cd dist; find * -type f | sort) > packlist pkg_info -X pkg_install | \ diff --git a/vcbuild.bat b/vcbuild.bat index 39c656f18..4763069cc 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -61,7 +61,8 @@ if /i "%1"=="test-message" set test=test-message&goto arg-ok if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok if /i "%1"=="test-all" set test=test-all&set buildnodeweak=1&goto arg-ok if /i "%1"=="test" set test=test&goto arg-ok -if /i "%1"=="msi" set msi=1&set licensertf=1&goto arg-ok +@rem Include small-icu support with MSI installer +if /i "%1"=="msi" set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok if /i "%1"=="upload" set upload=1&goto arg-ok if /i "%1"=="jslint" set jslint=1&goto arg-ok if /i "%1"=="small-icu" set i18n_arg=%1&goto arg-ok |