diff options
| author | Steven R. Loomis <srl@icu-project.org> | 2015-08-13 08:30:01 -0700 |
|---|---|---|
| committer | Steven R. Loomis <srl@icu-project.org> | 2015-08-13 08:30:01 -0700 |
| commit | 27813339cf713275fa7bbf2ae497d13b66aa78ce (patch) | |
| tree | 4b8fa9805c46d482dfed5ea980b9017c5f2468c8 /Makefile | |
| parent | 6dc01eb7fd961a6f7e9efc6aa765be567a80d300 (diff) | |
| download | android-node-v8-27813339cf713275fa7bbf2ae497d13b66aa78ce.tar.gz android-node-v8-27813339cf713275fa7bbf2ae497d13b66aa78ce.tar.bz2 android-node-v8-27813339cf713275fa7bbf2ae497d13b66aa78ce.zip | |
build: intl: converge from joyent/node
* turn on small-icu by default for builds (Makefile+Windows)
* add license info from ICU
http://source.icu-project.org/repos/icu/icu/trunk/license.html
All text pasted. Long lines wrapped. (original is HTML.)
Port from joyent/node of:
* https://github.com/nodejs/node/issues/26
* port of joyent/node 67f87a743dee4951374dd240c25e31cd507e6c5f
* https://github.com/joyent/node/pull/9038
* Merge from joyent/node 70d04e7f35667381aa6e9d76f56ea962c019d5bc
* Merge from joyent/node 6168fe6720650052728f3e78a495b723f0b41ce3
* merge from joyent/node e67073256d847be085be7049cd1d6ebd8d86ac62
PR-URL: https://github.com/nodejs/node/pull/2264
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Fixes: https://github.com/nodejs/node/issues/238
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -17,6 +17,11 @@ NODE ?= ./iojs$(EXEEXT) NODE_EXE = iojs$(EXEEXT) NODE_G_EXE = iojs_g$(EXEEXT) +# Flags for packaging. +BUILD_DOWNLOAD_FLAGS ?= --download=all +BUILD_INTL_FLAGS ?= --with-intl=small-icu +BUILD_RELEASE_FLAGS ?= $(BUILD_DOWNLOAD_FLAGS) $(BUILD_INTL_FLAGS) + # Default to verbose builds. # To do quiet/pretty builds, run `make V=` to set V to an empty string, # or set the V environment variable to an empty string. @@ -302,7 +307,7 @@ $(PKG): release-only --dest-cpu=x64 \ --tag=$(TAG) \ --release-urlbase=$(RELEASE_URLBASE) \ - $(CONFIG_FLAGS) + $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR) SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh cat tools/osx-pkg.pmdoc/index.xml.tmpl \ @@ -363,7 +368,7 @@ $(TARBALL)-headers: config.gypi release-only --dest-cpu=$(DESTCPU) \ --tag=$(TAG) \ --release-urlbase=$(RELEASE_URLBASE) \ - $(CONFIG_FLAGS) + $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/' find $(TARNAME)/ -type l | xargs rm # annoying on windows tar -cf $(TARNAME)-headers.tar $(TARNAME) @@ -393,7 +398,7 @@ $(BINARYTAR): release-only --dest-cpu=$(DESTCPU) \ --tag=$(TAG) \ --release-urlbase=$(RELEASE_URLBASE) \ - $(CONFIG_FLAGS) + $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) $(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1 cp README.md $(BINARYNAME) cp LICENSE $(BINARYNAME) |