2017-08-10 13:51:41 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
# Locate python2 interpreter and re-execute the script. Note that the
|
|
|
|
# mix of single and double quotes is intentional, as is the fact that
|
|
|
|
# the ] goes on a new line.
|
|
|
|
_=[ 'exec' '/bin/sh' '-c' '''
|
|
|
|
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
|
|
|
|
which python2 >/dev/null && exec python2 "$0" "$@"
|
|
|
|
exec python "$0" "$@"
|
|
|
|
''' "$0" "$@"
|
|
|
|
]
|
|
|
|
del _
|
2016-05-19 12:29:40 +02:00
|
|
|
|
2016-11-17 07:57:04 +01:00
|
|
|
import sys
|
2017-10-07 01:49:45 +02:00
|
|
|
from distutils.spawn import find_executable as which
|
2016-11-17 07:57:04 +01:00
|
|
|
if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
|
2017-02-15 12:30:40 +01:00
|
|
|
sys.stderr.write('Please use either Python 2.6 or 2.7')
|
|
|
|
|
|
|
|
python2 = which('python2') or which('python2.6') or which('python2.7')
|
|
|
|
|
|
|
|
if python2:
|
|
|
|
sys.stderr.write(':\n\n')
|
|
|
|
sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))
|
|
|
|
|
|
|
|
sys.stderr.write('\n')
|
2016-11-17 07:57:04 +01:00
|
|
|
sys.exit(1)
|
|
|
|
|
2016-05-19 12:29:40 +02:00
|
|
|
import errno
|
2011-11-15 04:02:44 +01:00
|
|
|
import optparse
|
|
|
|
import os
|
2011-12-18 23:53:07 +01:00
|
|
|
import pprint
|
2012-03-02 02:14:27 +01:00
|
|
|
import re
|
2012-09-15 03:06:25 +02:00
|
|
|
import shlex
|
2011-11-15 17:17:05 +01:00
|
|
|
import subprocess
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
import shutil
|
|
|
|
import string
|
2010-10-26 03:17:19 +02:00
|
|
|
|
2017-11-26 14:30:08 +01:00
|
|
|
# If not run from node/, cd to node/.
|
|
|
|
os.chdir(os.path.dirname(__file__) or '.')
|
|
|
|
|
2015-03-19 22:57:11 +01:00
|
|
|
# gcc and g++ as defaults matches what GYP's Makefile generator does,
|
|
|
|
# except on OS X.
|
|
|
|
CC = os.environ.get('CC', 'cc' if sys.platform == 'darwin' else 'gcc')
|
|
|
|
CXX = os.environ.get('CXX', 'c++' if sys.platform == 'darwin' else 'g++')
|
2012-03-05 16:55:24 +01:00
|
|
|
|
2017-11-26 14:30:08 +01:00
|
|
|
sys.path.insert(0, os.path.join('tools', 'gyp', 'pylib'))
|
2013-05-21 18:26:42 +02:00
|
|
|
from gyp.common import GetFlavor
|
2010-11-02 00:03:32 +01:00
|
|
|
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# imports in tools/configure.d
|
2017-11-26 14:30:08 +01:00
|
|
|
sys.path.insert(0, os.path.join('tools', 'configure.d'))
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
import nodedownload
|
|
|
|
|
2016-03-27 01:17:55 +01:00
|
|
|
# imports in tools/
|
2017-11-26 14:30:08 +01:00
|
|
|
sys.path.insert(0, 'tools')
|
2016-03-27 01:17:55 +01:00
|
|
|
import getmoduleversion
|
2017-04-25 23:36:50 +02:00
|
|
|
from gyp_node import run_gyp
|
2016-03-27 01:17:55 +01:00
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
# parse our options
|
|
|
|
parser = optparse.OptionParser()
|
2010-11-02 00:03:32 +01:00
|
|
|
|
2015-08-12 17:53:33 +02:00
|
|
|
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
|
2017-10-30 11:58:13 +01:00
|
|
|
'android', 'aix', 'cloudabi')
|
2017-06-11 21:59:51 +02:00
|
|
|
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
|
|
|
|
'ppc64', 'x32','x64', 'x86', 's390', 's390x')
|
2015-04-03 06:33:34 +02:00
|
|
|
valid_arm_float_abi = ('soft', 'softfp', 'hard')
|
2015-12-08 21:53:06 +01:00
|
|
|
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
|
2015-04-03 06:33:34 +02:00
|
|
|
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
|
|
|
|
valid_mips_fpu = ('fp32', 'fp64', 'fpxx')
|
|
|
|
valid_mips_float_abi = ('soft', 'hard')
|
2015-04-27 06:45:55 +02:00
|
|
|
valid_intl_modes = ('none', 'small-icu', 'full-icu', 'system-icu')
|
|
|
|
|
|
|
|
# create option groups
|
|
|
|
shared_optgroup = optparse.OptionGroup(parser, "Shared libraries",
|
|
|
|
"Flags that allows you to control whether you want to build against "
|
|
|
|
"built-in dependencies or its shared representations. If necessary, "
|
|
|
|
"provide multiple libraries with comma.")
|
|
|
|
intl_optgroup = optparse.OptionGroup(parser, "Internationalization",
|
2015-08-13 18:14:34 +02:00
|
|
|
"Flags that lets you enable i18n features in Node.js as well as which "
|
2015-04-27 06:45:55 +02:00
|
|
|
"library you want to build against.")
|
http2: introducing HTTP/2
At long last: The initial *experimental* implementation of HTTP/2.
This is an accumulation of the work that has been done in the nodejs/http2
repository, squashed down to a couple of commits. The original commit
history has been preserved in the nodejs/http2 repository.
This PR introduces the nghttp2 C library as a new dependency. This library
provides the majority of the HTTP/2 protocol implementation, with the rest
of the code here providing the mapping of the library into a usable JS API.
Within src, a handful of new node_http2_*.c and node_http2_*.h files are
introduced. These provide the internal mechanisms that interface with nghttp
and define the `process.binding('http2')` interface.
The JS API is defined within `internal/http2/*.js`.
There are two APIs provided: Core and Compat.
The Core API is HTTP/2 specific and is designed to be as minimal and as
efficient as possible.
The Compat API is intended to be as close to the existing HTTP/1 API as
possible, with some exceptions.
Tests, documentation and initial benchmarks are included.
The `http2` module is gated by a new `--expose-http2` command line flag.
When used, `require('http2')` will be exposed to users. Note that there
is an existing `http2` module on npm that would be impacted by the introduction
of this module, which is the main reason for gating this behind a flag.
When using `require('http2')` the first time, a process warning will be
emitted indicating that an experimental feature is being used.
To run the benchmarks, the `h2load` tool (part of the nghttp project) is
required: `./node benchmarks/http2/simple.js benchmarker=h2load`. Only
two benchmarks are currently available.
Additional configuration options to enable verbose debugging are provided:
```
$ ./configure --debug-http2 --debug-nghttp2
$ NODE_DEBUG=http2 ./node
```
The `--debug-http2` configuration option enables verbose debug statements
from the `src/node_http2_*` files. The `--debug-nghttp2` enables the nghttp
library's own verbose debug output. The `NODE_DEBUG=http2` enables JS-level
debug output.
The following illustrates as simple HTTP/2 server and client interaction:
(The HTTP/2 client and server support both plain text and TLS connections)
```jt client = http2.connect('http://localhost:80');
const req = client.request({ ':path': '/some/path' });
req.on('data', (chunk) => { /* do something with the data */ });
req.on('end', () => {
client.destroy();
});
// Plain text (non-TLS server)
const server = http2.createServer();
server.on('stream', (stream, requestHeaders) => {
stream.respond({ ':status': 200 });
stream.write('hello ');
stream.end('world');
});
server.listen(80);
```
```js
const http2 = require('http2');
const client = http2.connect('http://localhost');
```
Author: Anna Henningsen <anna@addaleax.net>
Author: Colin Ihrig <cjihrig@gmail.com>
Author: Daniel Bevenius <daniel.bevenius@gmail.com>
Author: James M Snell <jasnell@gmail.com>
Author: Jun Mukai
Author: Kelvin Jin
Author: Matteo Collina <matteo.collina@gmail.com>
Author: Robert Kowalski <rok@kowalski.gd>
Author: Santiago Gimeno <santiago.gimeno@gmail.com>
Author: Sebastiaan Deckers <sebdeckers83@gmail.com>
Author: Yosuke Furukawa <yosuke.furukawa@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/14239
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
2017-07-17 19:17:16 +02:00
|
|
|
http2_optgroup = optparse.OptionGroup(parser, "HTTP2",
|
|
|
|
"Flags that allows you to control HTTP2 features in Node.js")
|
2015-04-03 06:33:34 +02:00
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
# Options should be in alphabetical order but keep --prefix at the top,
|
|
|
|
# that's arguably the one people will be looking for most.
|
|
|
|
parser.add_option('--prefix',
|
|
|
|
action='store',
|
|
|
|
dest='prefix',
|
2015-04-03 06:33:34 +02:00
|
|
|
default='/usr/local',
|
|
|
|
help='select the install prefix [default: %default]')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2016-10-14 14:33:25 +02:00
|
|
|
parser.add_option('--coverage',
|
|
|
|
action='store_true',
|
|
|
|
dest='coverage',
|
|
|
|
help='Build node with code coverage enabled')
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--debug',
|
|
|
|
action='store_true',
|
|
|
|
dest='debug',
|
|
|
|
help='also build debug build')
|
|
|
|
|
|
|
|
parser.add_option('--dest-cpu',
|
|
|
|
action='store',
|
|
|
|
dest='dest_cpu',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_arch,
|
|
|
|
help='CPU architecture to build for ({0})'.format(', '.join(valid_arch)))
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2016-12-26 14:29:25 +01:00
|
|
|
parser.add_option('--cross-compiling',
|
|
|
|
action='store_true',
|
|
|
|
dest='cross_compiling',
|
|
|
|
default=None,
|
|
|
|
help='force build to be considered as cross compiled')
|
|
|
|
parser.add_option('--no-cross-compiling',
|
|
|
|
action='store_false',
|
|
|
|
dest='cross_compiling',
|
|
|
|
default=None,
|
|
|
|
help='force build to be considered as NOT cross compiled')
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--dest-os',
|
|
|
|
action='store',
|
|
|
|
dest='dest_os',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_os,
|
|
|
|
help='operating system to build for ({0})'.format(', '.join(valid_os)))
|
2013-08-10 13:34:57 +02:00
|
|
|
|
|
|
|
parser.add_option('--gdb',
|
|
|
|
action='store_true',
|
|
|
|
dest='gdb',
|
|
|
|
help='add gdb support')
|
|
|
|
|
|
|
|
parser.add_option('--no-ifaddrs',
|
|
|
|
action='store_true',
|
|
|
|
dest='no_ifaddrs',
|
|
|
|
help='use on deprecated SunOS systems that do not support ifaddrs.h')
|
|
|
|
|
2014-08-23 23:01:06 +02:00
|
|
|
parser.add_option("--fully-static",
|
|
|
|
action="store_true",
|
|
|
|
dest="fully_static",
|
|
|
|
help="Generate an executable without external dynamic libraries. This "
|
2015-12-04 09:14:24 +01:00
|
|
|
"will not work on OSX when using the default compilation environment")
|
|
|
|
|
|
|
|
parser.add_option("--partly-static",
|
|
|
|
action="store_true",
|
|
|
|
dest="partly_static",
|
|
|
|
help="Generate an executable with libgcc and libstdc++ libraries. This "
|
|
|
|
"will not work on OSX when using the default compilation environment")
|
2014-08-23 23:01:06 +02:00
|
|
|
|
2015-10-21 18:24:12 +02:00
|
|
|
parser.add_option("--enable-vtune-profiling",
|
|
|
|
action="store_true",
|
|
|
|
dest="enable_vtune_profiling",
|
2017-11-16 13:33:10 +01:00
|
|
|
help="Enable profiling support for Intel VTune profiler to profile "
|
2015-10-21 18:24:12 +02:00
|
|
|
"JavaScript code executed in nodejs. This feature is only available "
|
2017-12-05 04:57:00 +01:00
|
|
|
"for x32, x86, and x64 architectures.")
|
2015-10-21 18:24:12 +02:00
|
|
|
|
|
|
|
|
2015-08-22 20:36:03 +02:00
|
|
|
parser.add_option("--link-module",
|
|
|
|
action="append",
|
|
|
|
dest="linked_module",
|
2017-11-16 13:33:10 +01:00
|
|
|
help="Path to a JS file to be bundled in the binary as a builtin. "
|
|
|
|
"This module will be referenced by path without extension; "
|
|
|
|
"e.g. /root/x/y.js will be referenced via require('root/x/y'). "
|
2015-08-22 20:36:03 +02:00
|
|
|
"Can be used multiple times")
|
|
|
|
|
2014-09-02 13:53:36 +02:00
|
|
|
parser.add_option("--openssl-no-asm",
|
|
|
|
action="store_true",
|
|
|
|
dest="openssl_no_asm",
|
|
|
|
help="Do not build optimized assembly for OpenSSL")
|
|
|
|
|
2015-06-01 23:49:43 +02:00
|
|
|
parser.add_option('--openssl-fips',
|
|
|
|
action='store',
|
|
|
|
dest='openssl_fips',
|
|
|
|
help='Build OpenSSL using FIPS canister .o file in supplied folder')
|
|
|
|
|
2016-12-21 11:16:38 +01:00
|
|
|
parser.add_option('--openssl-use-def-ca-store',
|
|
|
|
action='store_true',
|
|
|
|
dest='use_openssl_ca_store',
|
|
|
|
help='Use OpenSSL supplied CA store instead of compiled-in Mozilla CA copy.')
|
|
|
|
|
2017-11-06 10:30:29 +01:00
|
|
|
parser.add_option('--openssl-system-ca-path',
|
|
|
|
action='store',
|
|
|
|
dest='openssl_system_ca_path',
|
|
|
|
help='Use the specified path to system CA (PEM format) in addition to '
|
|
|
|
'the OpenSSL supplied CA store or compiled-in Mozilla CA copy.')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-http-parser',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store_true',
|
|
|
|
dest='shared_http_parser',
|
|
|
|
help='link to a shared http_parser DLL instead of static linking')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-http-parser-includes',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_http_parser_includes',
|
|
|
|
help='directory containing http_parser header files')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-http-parser-libname',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_http_parser_libname',
|
2015-04-03 06:33:34 +02:00
|
|
|
default='http_parser',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-http-parser-libpath',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_http_parser_libpath',
|
|
|
|
help='a directory to search for the shared http_parser DLL')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-libuv',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store_true',
|
|
|
|
dest='shared_libuv',
|
|
|
|
help='link to a shared libuv DLL instead of static linking')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-libuv-includes',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_libuv_includes',
|
|
|
|
help='directory containing libuv header files')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-libuv-libname',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_libuv_libname',
|
2015-04-03 06:33:34 +02:00
|
|
|
default='uv',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-libuv-libpath',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_libuv_libpath',
|
|
|
|
help='a directory to search for the shared libuv DLL')
|
|
|
|
|
2017-11-06 09:59:01 +01:00
|
|
|
shared_optgroup.add_option('--shared-nghttp2',
|
|
|
|
action='store_true',
|
|
|
|
dest='shared_nghttp2',
|
|
|
|
help='link to a shared nghttp2 DLL instead of static linking')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-nghttp2-includes',
|
|
|
|
action='store',
|
|
|
|
dest='shared_nghttp2_includes',
|
|
|
|
help='directory containing nghttp2 header files')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-nghttp2-libname',
|
|
|
|
action='store',
|
|
|
|
dest='shared_nghttp2_libname',
|
|
|
|
default='nghttp2',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-nghttp2-libpath',
|
|
|
|
action='store',
|
|
|
|
dest='shared_nghttp2_libpath',
|
|
|
|
help='a directory to search for the shared nghttp2 DLLs')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-openssl',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store_true',
|
|
|
|
dest='shared_openssl',
|
|
|
|
help='link to a shared OpenSSl DLL instead of static linking')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-openssl-includes',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_openssl_includes',
|
|
|
|
help='directory containing OpenSSL header files')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-openssl-libname',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_openssl_libname',
|
2015-04-03 06:33:34 +02:00
|
|
|
default='crypto,ssl',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-openssl-libpath',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_openssl_libpath',
|
|
|
|
help='a directory to search for the shared OpenSSL DLLs')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-zlib',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store_true',
|
|
|
|
dest='shared_zlib',
|
|
|
|
help='link to a shared zlib DLL instead of static linking')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-zlib-includes',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_zlib_includes',
|
|
|
|
help='directory containing zlib header files')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-zlib-libname',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_zlib_libname',
|
2015-04-03 06:33:34 +02:00
|
|
|
default='z',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
shared_optgroup.add_option('--shared-zlib-libpath',
|
2013-08-10 13:34:57 +02:00
|
|
|
action='store',
|
|
|
|
dest='shared_zlib_libpath',
|
|
|
|
help='a directory to search for the shared zlib DLL')
|
|
|
|
|
2016-03-17 23:25:17 +01:00
|
|
|
shared_optgroup.add_option('--shared-cares',
|
|
|
|
action='store_true',
|
|
|
|
dest='shared_libcares',
|
|
|
|
help='link to a shared cares DLL instead of static linking')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-cares-includes',
|
|
|
|
action='store',
|
|
|
|
dest='shared_libcares_includes',
|
|
|
|
help='directory containing cares header files')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-cares-libname',
|
|
|
|
action='store',
|
|
|
|
dest='shared_libcares_libname',
|
|
|
|
default='cares',
|
|
|
|
help='alternative lib name to link to [default: %default]')
|
|
|
|
|
|
|
|
shared_optgroup.add_option('--shared-cares-libpath',
|
|
|
|
action='store',
|
|
|
|
dest='shared_libcares_libpath',
|
|
|
|
help='a directory to search for the shared cares DLL')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
parser.add_option_group(shared_optgroup)
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--systemtap-includes',
|
|
|
|
action='store',
|
|
|
|
dest='systemtap_includes',
|
2016-02-05 06:10:53 +01:00
|
|
|
help='directory containing systemtap header files')
|
2012-11-01 01:36:41 +01:00
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--tag',
|
|
|
|
action='store',
|
|
|
|
dest='tag',
|
|
|
|
help='custom build tag')
|
|
|
|
|
2015-01-18 07:41:37 +01:00
|
|
|
parser.add_option('--release-urlbase',
|
|
|
|
action='store',
|
|
|
|
dest='release_urlbase',
|
|
|
|
help='Provide a custom URL prefix for the `process.release` properties '
|
|
|
|
'`sourceUrl` and `headersUrl`. When compiling a release build, this '
|
2015-09-23 06:44:47 +02:00
|
|
|
'will default to https://nodejs.org/download/release/')
|
2015-01-18 07:41:37 +01:00
|
|
|
|
2016-07-05 16:18:38 +02:00
|
|
|
parser.add_option('--enable-d8',
|
|
|
|
action='store_true',
|
|
|
|
dest='enable_d8',
|
|
|
|
help=optparse.SUPPRESS_HELP) # Unsupported, undocumented.
|
|
|
|
|
2017-07-01 02:08:32 +02:00
|
|
|
parser.add_option('--enable-trace-maps',
|
|
|
|
action='store_true',
|
|
|
|
dest='trace_maps',
|
|
|
|
help='Enable the --trace-maps flag in V8 (use at your own risk)')
|
|
|
|
|
2014-03-26 21:30:49 +01:00
|
|
|
parser.add_option('--v8-options',
|
|
|
|
action='store',
|
|
|
|
dest='v8_options',
|
2014-03-31 14:22:49 +02:00
|
|
|
help='v8 options to pass, see `node --v8-options` for examples.')
|
2014-03-26 21:30:49 +01:00
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--with-arm-float-abi',
|
|
|
|
action='store',
|
|
|
|
dest='arm_float_abi',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_arm_float_abi,
|
|
|
|
help='specifies which floating-point ABI to use ({0}).'.format(
|
|
|
|
', '.join(valid_arm_float_abi)))
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-09-18 11:28:19 +02:00
|
|
|
parser.add_option('--with-arm-fpu',
|
|
|
|
action='store',
|
|
|
|
dest='arm_fpu',
|
|
|
|
choices=valid_arm_fpu,
|
|
|
|
help='ARM FPU mode ({0}) [default: %default]'.format(
|
|
|
|
', '.join(valid_arm_fpu)))
|
|
|
|
|
2015-03-03 21:55:59 +01:00
|
|
|
parser.add_option('--with-mips-arch-variant',
|
|
|
|
action='store',
|
|
|
|
dest='mips_arch_variant',
|
|
|
|
default='r2',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_mips_arch,
|
|
|
|
help='MIPS arch variant ({0}) [default: %default]'.format(
|
|
|
|
', '.join(valid_mips_arch)))
|
2015-03-03 21:55:59 +01:00
|
|
|
|
|
|
|
parser.add_option('--with-mips-fpu-mode',
|
|
|
|
action='store',
|
|
|
|
dest='mips_fpu_mode',
|
|
|
|
default='fp32',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_mips_fpu,
|
|
|
|
help='MIPS FPU mode ({0}) [default: %default]'.format(
|
|
|
|
', '.join(valid_mips_fpu)))
|
2015-03-03 21:55:59 +01:00
|
|
|
|
|
|
|
parser.add_option('--with-mips-float-abi',
|
|
|
|
action='store',
|
|
|
|
dest='mips_float_abi',
|
|
|
|
default='hard',
|
2015-04-03 06:33:34 +02:00
|
|
|
choices=valid_mips_float_abi,
|
|
|
|
help='MIPS floating-point ABI ({0}) [default: %default]'.format(
|
|
|
|
', '.join(valid_mips_float_abi)))
|
2015-03-03 21:55:59 +01:00
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--with-dtrace',
|
|
|
|
action='store_true',
|
|
|
|
dest='with_dtrace',
|
2015-06-19 17:31:17 +02:00
|
|
|
help='build with DTrace (default is true on sunos and darwin)')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2015-01-22 13:35:16 +01:00
|
|
|
parser.add_option('--with-lttng',
|
|
|
|
action='store_true',
|
|
|
|
dest='with_lttng',
|
2017-10-09 12:58:27 +02:00
|
|
|
help='build with Lttng (Only supported on Linux)')
|
2015-01-22 13:35:16 +01:00
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--with-etw',
|
|
|
|
action='store_true',
|
|
|
|
dest='with_etw',
|
|
|
|
help='build with ETW (default is true on Windows)')
|
|
|
|
|
2015-05-12 05:42:54 +02:00
|
|
|
intl_optgroup.add_option('--with-intl',
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
action='store',
|
2015-04-27 06:45:55 +02:00
|
|
|
dest='with_intl',
|
2016-04-09 04:03:24 +02:00
|
|
|
default='small-icu',
|
2015-04-27 06:45:55 +02:00
|
|
|
choices=valid_intl_modes,
|
|
|
|
help='Intl mode (valid choices: {0}) [default: %default]'.format(
|
|
|
|
', '.join(valid_intl_modes)))
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
|
2016-04-09 04:03:24 +02:00
|
|
|
intl_optgroup.add_option('--without-intl',
|
|
|
|
action='store_const',
|
|
|
|
dest='with_intl',
|
|
|
|
const='none',
|
2017-05-11 18:10:27 +02:00
|
|
|
help='Disable Intl, same as --with-intl=none (disables inspector)')
|
2016-04-09 04:03:24 +02:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
intl_optgroup.add_option('--with-icu-path',
|
2013-11-21 17:13:58 +01:00
|
|
|
action='store',
|
|
|
|
dest='with_icu_path',
|
|
|
|
help='Path to icu.gyp (ICU i18n, Chromium version only.)')
|
|
|
|
|
2016-04-09 04:03:24 +02:00
|
|
|
icu_default_locales='root,en'
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
intl_optgroup.add_option('--with-icu-locales',
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
action='store',
|
|
|
|
dest='with_icu_locales',
|
2016-04-09 04:03:24 +02:00
|
|
|
default=icu_default_locales,
|
2015-04-03 06:33:34 +02:00
|
|
|
help='Comma-separated list of locales for "small-icu". "root" is assumed. '
|
|
|
|
'[default: %default]')
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
intl_optgroup.add_option('--with-icu-source',
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
action='store',
|
|
|
|
dest='with_icu_source',
|
|
|
|
help='Intl mode: optional local path to icu/ dir, or path/URL of icu source archive.')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
intl_optgroup.add_option('--download',
|
|
|
|
action='store',
|
|
|
|
dest='download_list',
|
|
|
|
help=nodedownload.help())
|
|
|
|
|
2015-10-06 08:09:06 +02:00
|
|
|
intl_optgroup.add_option('--download-path',
|
|
|
|
action='store',
|
|
|
|
dest='download_path',
|
2017-11-26 14:30:08 +01:00
|
|
|
default='deps',
|
2015-10-06 08:09:06 +02:00
|
|
|
help='Download directory [default: %default]')
|
|
|
|
|
2015-04-27 06:45:55 +02:00
|
|
|
parser.add_option_group(intl_optgroup)
|
|
|
|
|
http2: introducing HTTP/2
At long last: The initial *experimental* implementation of HTTP/2.
This is an accumulation of the work that has been done in the nodejs/http2
repository, squashed down to a couple of commits. The original commit
history has been preserved in the nodejs/http2 repository.
This PR introduces the nghttp2 C library as a new dependency. This library
provides the majority of the HTTP/2 protocol implementation, with the rest
of the code here providing the mapping of the library into a usable JS API.
Within src, a handful of new node_http2_*.c and node_http2_*.h files are
introduced. These provide the internal mechanisms that interface with nghttp
and define the `process.binding('http2')` interface.
The JS API is defined within `internal/http2/*.js`.
There are two APIs provided: Core and Compat.
The Core API is HTTP/2 specific and is designed to be as minimal and as
efficient as possible.
The Compat API is intended to be as close to the existing HTTP/1 API as
possible, with some exceptions.
Tests, documentation and initial benchmarks are included.
The `http2` module is gated by a new `--expose-http2` command line flag.
When used, `require('http2')` will be exposed to users. Note that there
is an existing `http2` module on npm that would be impacted by the introduction
of this module, which is the main reason for gating this behind a flag.
When using `require('http2')` the first time, a process warning will be
emitted indicating that an experimental feature is being used.
To run the benchmarks, the `h2load` tool (part of the nghttp project) is
required: `./node benchmarks/http2/simple.js benchmarker=h2load`. Only
two benchmarks are currently available.
Additional configuration options to enable verbose debugging are provided:
```
$ ./configure --debug-http2 --debug-nghttp2
$ NODE_DEBUG=http2 ./node
```
The `--debug-http2` configuration option enables verbose debug statements
from the `src/node_http2_*` files. The `--debug-nghttp2` enables the nghttp
library's own verbose debug output. The `NODE_DEBUG=http2` enables JS-level
debug output.
The following illustrates as simple HTTP/2 server and client interaction:
(The HTTP/2 client and server support both plain text and TLS connections)
```jt client = http2.connect('http://localhost:80');
const req = client.request({ ':path': '/some/path' });
req.on('data', (chunk) => { /* do something with the data */ });
req.on('end', () => {
client.destroy();
});
// Plain text (non-TLS server)
const server = http2.createServer();
server.on('stream', (stream, requestHeaders) => {
stream.respond({ ':status': 200 });
stream.write('hello ');
stream.end('world');
});
server.listen(80);
```
```js
const http2 = require('http2');
const client = http2.connect('http://localhost');
```
Author: Anna Henningsen <anna@addaleax.net>
Author: Colin Ihrig <cjihrig@gmail.com>
Author: Daniel Bevenius <daniel.bevenius@gmail.com>
Author: James M Snell <jasnell@gmail.com>
Author: Jun Mukai
Author: Kelvin Jin
Author: Matteo Collina <matteo.collina@gmail.com>
Author: Robert Kowalski <rok@kowalski.gd>
Author: Santiago Gimeno <santiago.gimeno@gmail.com>
Author: Sebastiaan Deckers <sebdeckers83@gmail.com>
Author: Yosuke Furukawa <yosuke.furukawa@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/14239
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
2017-07-17 19:17:16 +02:00
|
|
|
http2_optgroup.add_option('--debug-http2',
|
|
|
|
action='store_true',
|
|
|
|
dest='debug_http2',
|
|
|
|
help='build with http2 debug statements on (default is false)')
|
|
|
|
|
|
|
|
http2_optgroup.add_option('--debug-nghttp2',
|
|
|
|
action='store_true',
|
|
|
|
dest='debug_nghttp2',
|
|
|
|
help='build nghttp2 with DEBUGBUILD (default is false)')
|
|
|
|
|
2017-09-05 13:08:17 +02:00
|
|
|
parser.add_option_group(http2_optgroup)
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--with-perfctr',
|
|
|
|
action='store_true',
|
|
|
|
dest='with_perfctr',
|
|
|
|
help='build with performance counters (default is true on Windows)')
|
|
|
|
|
|
|
|
parser.add_option('--without-dtrace',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_dtrace',
|
|
|
|
help='build without DTrace')
|
|
|
|
|
|
|
|
parser.add_option('--without-etw',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_etw',
|
|
|
|
help='build without ETW')
|
|
|
|
|
|
|
|
parser.add_option('--without-npm',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_npm',
|
2016-06-29 10:12:10 +02:00
|
|
|
help='do not install the bundled npm (package manager)')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
|
|
|
parser.add_option('--without-perfctr',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_perfctr',
|
|
|
|
help='build without performance counters')
|
|
|
|
|
2015-05-08 20:56:13 +02:00
|
|
|
# Dummy option for backwards compatibility
|
2015-01-24 01:06:07 +01:00
|
|
|
parser.add_option('--with-snapshot',
|
|
|
|
action='store_true',
|
2017-07-18 14:38:43 +02:00
|
|
|
dest='unused_with_snapshot',
|
2015-01-24 01:06:07 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--without-snapshot',
|
|
|
|
action='store_true',
|
2017-07-18 14:38:43 +02:00
|
|
|
dest='without_snapshot',
|
2015-01-24 01:06:07 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-10 13:34:57 +02:00
|
|
|
|
|
|
|
parser.add_option('--without-ssl',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_ssl',
|
2017-05-11 18:10:27 +02:00
|
|
|
help='build without SSL (disables crypto, https, inspector, etc.)')
|
2013-08-10 13:34:57 +02:00
|
|
|
|
2017-02-20 15:18:43 +01:00
|
|
|
parser.add_option('--without-node-options',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_node_options',
|
|
|
|
help='build without NODE_OPTIONS support')
|
|
|
|
|
2013-08-10 13:34:57 +02:00
|
|
|
parser.add_option('--xcode',
|
|
|
|
action='store_true',
|
|
|
|
dest='use_xcode',
|
|
|
|
help='generate build files for use with xcode')
|
2012-12-21 02:56:47 +01:00
|
|
|
|
2016-05-16 03:51:07 +02:00
|
|
|
parser.add_option('--ninja',
|
|
|
|
action='store_true',
|
|
|
|
dest='use_ninja',
|
|
|
|
help='generate build files for use with Ninja')
|
|
|
|
|
2015-08-14 10:07:18 +02:00
|
|
|
parser.add_option('--enable-asan',
|
|
|
|
action='store_true',
|
|
|
|
dest='enable_asan',
|
|
|
|
help='build with asan')
|
|
|
|
|
2015-04-04 16:04:49 +02:00
|
|
|
parser.add_option('--enable-static',
|
|
|
|
action='store_true',
|
|
|
|
dest='enable_static',
|
|
|
|
help='build as static library')
|
|
|
|
|
2016-03-23 02:05:54 +01:00
|
|
|
parser.add_option('--no-browser-globals',
|
|
|
|
action='store_true',
|
|
|
|
dest='no_browser_globals',
|
|
|
|
help='do not export browser globals like setTimeout, console, etc. ' +
|
|
|
|
'(This mode is not officially supported for regular applications)')
|
|
|
|
|
2016-02-07 17:47:14 +01:00
|
|
|
parser.add_option('--without-inspector',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_inspector',
|
2017-05-11 18:10:27 +02:00
|
|
|
help='disable the V8 inspector protocol')
|
2016-02-07 17:47:14 +01:00
|
|
|
|
2016-03-27 01:17:55 +01:00
|
|
|
parser.add_option('--shared',
|
|
|
|
action='store_true',
|
|
|
|
dest='shared',
|
|
|
|
help='compile shared library for embedding node in another project. ' +
|
|
|
|
'(This mode is not officially supported for regular applications)')
|
|
|
|
|
|
|
|
parser.add_option('--without-v8-platform',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_v8_platform',
|
|
|
|
default=False,
|
|
|
|
help='do not initialize v8 platform during node.js startup. ' +
|
|
|
|
'(This mode is not officially supported for regular applications)')
|
|
|
|
|
|
|
|
parser.add_option('--without-bundled-v8',
|
|
|
|
action='store_true',
|
|
|
|
dest='without_bundled_v8',
|
|
|
|
default=False,
|
|
|
|
help='do not use V8 includes from the bundled deps folder. ' +
|
|
|
|
'(This mode is not officially supported for regular applications)')
|
|
|
|
|
2016-08-05 13:23:22 +02:00
|
|
|
# Create compile_commands.json in out/Debug and out/Release.
|
|
|
|
parser.add_option('-C',
|
|
|
|
action='store_true',
|
|
|
|
dest='compile_commands_json',
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
(options, args) = parser.parse_args()
|
|
|
|
|
2015-08-05 14:44:21 +02:00
|
|
|
# Expand ~ in the install prefix now, it gets written to multiple files.
|
|
|
|
options.prefix = os.path.expanduser(options.prefix or '')
|
|
|
|
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# set up auto-download list
|
|
|
|
auto_downloads = nodedownload.parse(options.download_list)
|
2011-11-15 04:02:44 +01:00
|
|
|
|
2015-01-24 01:06:07 +01:00
|
|
|
|
|
|
|
def warn(msg):
|
2015-01-28 17:46:19 +01:00
|
|
|
warn.warned = True
|
|
|
|
prefix = '\033[1m\033[93mWARNING\033[0m' if os.isatty(1) else 'WARNING'
|
2015-01-24 01:06:07 +01:00
|
|
|
print('%s: %s' % (prefix, msg))
|
|
|
|
|
2017-02-06 02:18:46 +01:00
|
|
|
# track if warnings occurred
|
2015-01-28 17:46:19 +01:00
|
|
|
warn.warned = False
|
2015-01-24 01:06:07 +01:00
|
|
|
|
2011-11-29 16:27:52 +01:00
|
|
|
def b(value):
|
|
|
|
"""Returns the string 'true' if value is truthy, 'false' otherwise."""
|
|
|
|
if value:
|
|
|
|
return 'true'
|
|
|
|
else:
|
|
|
|
return 'false'
|
|
|
|
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
def pkg_config(pkg):
|
2015-05-04 05:57:17 +02:00
|
|
|
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
|
|
|
|
retval = ()
|
|
|
|
for flag in ['--libs-only-l', '--cflags-only-I', '--libs-only-L']:
|
|
|
|
try:
|
2016-05-19 12:29:40 +02:00
|
|
|
proc = subprocess.Popen(
|
|
|
|
shlex.split(pkg_config) + ['--silence-errors', flag, pkg],
|
|
|
|
stdout=subprocess.PIPE)
|
|
|
|
val = proc.communicate()[0].strip()
|
2016-11-17 07:57:04 +01:00
|
|
|
except OSError as e:
|
2016-05-19 12:29:40 +02:00
|
|
|
if e.errno != errno.ENOENT: raise e # Unexpected error.
|
|
|
|
return (None, None, None) # No pkg-config/pkgconf installed.
|
2015-05-04 05:57:17 +02:00
|
|
|
retval += (val,)
|
|
|
|
return retval
|
|
|
|
|
|
|
|
|
2015-01-15 22:36:38 +01:00
|
|
|
def try_check_compiler(cc, lang):
|
|
|
|
try:
|
|
|
|
proc = subprocess.Popen(shlex.split(cc) + ['-E', '-P', '-x', lang, '-'],
|
|
|
|
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
|
|
|
except OSError:
|
|
|
|
return (False, False, '', '')
|
|
|
|
|
|
|
|
proc.stdin.write('__clang__ __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ '
|
|
|
|
'__clang_major__ __clang_minor__ __clang_patchlevel__')
|
|
|
|
|
|
|
|
values = (proc.communicate()[0].split() + ['0'] * 7)[0:7]
|
|
|
|
is_clang = values[0] == '1'
|
|
|
|
gcc_version = '%s.%s.%s' % tuple(values[1:1+3])
|
|
|
|
clang_version = '%s.%s.%s' % tuple(values[4:4+3])
|
|
|
|
|
|
|
|
return (True, is_clang, clang_version, gcc_version)
|
|
|
|
|
|
|
|
|
2015-03-31 07:16:10 +02:00
|
|
|
#
|
|
|
|
# The version of asm compiler is needed for building openssl asm files.
|
|
|
|
# See deps/openssl/openssl.gypi for detail.
|
2015-09-23 06:48:38 +02:00
|
|
|
# Commands and regular expressions to obtain its version number are taken from
|
2015-03-31 07:16:10 +02:00
|
|
|
# https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/crypto/sha/asm/sha512-x86_64.pl#L112-L129
|
|
|
|
#
|
2016-03-03 22:38:24 +01:00
|
|
|
def get_version_helper(cc, regexp):
|
2015-03-31 07:16:10 +02:00
|
|
|
try:
|
|
|
|
proc = subprocess.Popen(shlex.split(cc) + ['-v'], stdin=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE, stdout=subprocess.PIPE)
|
|
|
|
except OSError:
|
2016-11-17 07:57:04 +01:00
|
|
|
print('''Node.js configure error: No acceptable C compiler found!
|
2015-03-31 07:16:10 +02:00
|
|
|
|
|
|
|
Please make sure you have a C compiler installed on your system and/or
|
|
|
|
consider adjusting the CC environment variable if you installed
|
|
|
|
it in a non-standard prefix.
|
2016-11-17 07:57:04 +01:00
|
|
|
''')
|
2015-03-31 07:16:10 +02:00
|
|
|
sys.exit()
|
|
|
|
|
2016-03-03 22:38:24 +01:00
|
|
|
match = re.search(regexp, proc.communicate()[1])
|
2015-03-31 07:16:10 +02:00
|
|
|
|
|
|
|
if match:
|
|
|
|
return match.group(2)
|
|
|
|
else:
|
|
|
|
return 0
|
|
|
|
|
2016-03-03 22:38:24 +01:00
|
|
|
def get_llvm_version(cc):
|
|
|
|
return get_version_helper(
|
2017-03-03 07:22:08 +01:00
|
|
|
cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)")
|
2016-03-03 22:38:24 +01:00
|
|
|
|
|
|
|
def get_xcode_version(cc):
|
|
|
|
return get_version_helper(
|
2017-03-03 07:22:08 +01:00
|
|
|
cc, r"(^Apple LLVM version) ([5-9]\.[0-9]+)")
|
2015-03-31 07:16:10 +02:00
|
|
|
|
|
|
|
def get_gas_version(cc):
|
|
|
|
try:
|
|
|
|
proc = subprocess.Popen(shlex.split(cc) + ['-Wa,-v', '-c', '-o',
|
|
|
|
'/dev/null', '-x',
|
|
|
|
'assembler', '/dev/null'],
|
|
|
|
stdin=subprocess.PIPE, stderr=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE)
|
|
|
|
except OSError:
|
2016-11-17 07:57:04 +01:00
|
|
|
print('''Node.js configure error: No acceptable C compiler found!
|
2015-03-31 07:16:10 +02:00
|
|
|
|
|
|
|
Please make sure you have a C compiler installed on your system and/or
|
|
|
|
consider adjusting the CC environment variable if you installed
|
|
|
|
it in a non-standard prefix.
|
2016-11-17 07:57:04 +01:00
|
|
|
''')
|
2015-03-31 07:16:10 +02:00
|
|
|
sys.exit()
|
|
|
|
|
|
|
|
match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)",
|
|
|
|
proc.communicate()[1])
|
|
|
|
|
|
|
|
if match:
|
|
|
|
return match.group(1)
|
|
|
|
else:
|
|
|
|
return 0
|
|
|
|
|
2015-01-15 22:36:38 +01:00
|
|
|
# Note: Apple clang self-reports as clang 4.2.0 and gcc 4.2.1. It passes
|
|
|
|
# the version check more by accident than anything else but a more rigorous
|
|
|
|
# check involves checking the build number against a whitelist. I'm not
|
|
|
|
# quite prepared to go that far yet.
|
2015-03-31 07:16:10 +02:00
|
|
|
def check_compiler(o):
|
2015-01-15 22:36:38 +01:00
|
|
|
if sys.platform == 'win32':
|
|
|
|
return
|
|
|
|
|
|
|
|
ok, is_clang, clang_version, gcc_version = try_check_compiler(CXX, 'c++')
|
|
|
|
if not ok:
|
|
|
|
warn('failed to autodetect C++ compiler version (CXX=%s)' % CXX)
|
2017-07-12 21:35:57 +02:00
|
|
|
elif clang_version < '3.4.2' if is_clang else gcc_version < '4.9.4':
|
|
|
|
warn('C++ compiler too old, need g++ 4.9.4 or clang++ 3.4.2 (CXX=%s)' % CXX)
|
2015-01-15 22:36:38 +01:00
|
|
|
|
|
|
|
ok, is_clang, clang_version, gcc_version = try_check_compiler(CC, 'c')
|
|
|
|
if not ok:
|
|
|
|
warn('failed to autodetect C compiler version (CC=%s)' % CC)
|
|
|
|
elif not is_clang and gcc_version < '4.2.0':
|
|
|
|
# clang 3.2 is a little white lie because any clang version will probably
|
|
|
|
# do for the C bits. However, we might as well encourage people to upgrade
|
|
|
|
# to a version that is not completely ancient.
|
|
|
|
warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC)
|
|
|
|
|
2017-11-04 01:57:18 +01:00
|
|
|
o['variables']['llvm_version'] = get_llvm_version(CC) if is_clang else 0
|
2017-07-05 12:43:47 +02:00
|
|
|
|
|
|
|
# Need xcode_version or gas_version when openssl asm files are compiled.
|
2015-03-31 07:16:10 +02:00
|
|
|
if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
|
|
|
|
return
|
|
|
|
|
|
|
|
if is_clang:
|
2016-03-03 22:38:24 +01:00
|
|
|
if sys.platform == 'darwin':
|
|
|
|
o['variables']['xcode_version'] = get_xcode_version(CC)
|
2015-03-31 07:16:10 +02:00
|
|
|
else:
|
|
|
|
o['variables']['gas_version'] = get_gas_version(CC)
|
|
|
|
|
2015-01-15 22:36:38 +01:00
|
|
|
|
2015-08-12 17:53:33 +02:00
|
|
|
def cc_macros(cc=None):
|
|
|
|
"""Checks predefined macros using the C compiler command."""
|
2012-02-20 21:27:07 +01:00
|
|
|
|
2012-05-05 00:06:24 +02:00
|
|
|
try:
|
2015-08-12 17:53:33 +02:00
|
|
|
p = subprocess.Popen(shlex.split(cc or CC) + ['-dM', '-E', '-'],
|
2012-05-05 00:06:24 +02:00
|
|
|
stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE)
|
|
|
|
except OSError:
|
2016-11-17 07:57:04 +01:00
|
|
|
print('''Node.js configure error: No acceptable C compiler found!
|
2012-05-05 00:06:24 +02:00
|
|
|
|
|
|
|
Please make sure you have a C compiler installed on your system and/or
|
|
|
|
consider adjusting the CC environment variable if you installed
|
|
|
|
it in a non-standard prefix.
|
2016-11-17 07:57:04 +01:00
|
|
|
''')
|
2012-05-05 00:06:24 +02:00
|
|
|
sys.exit()
|
|
|
|
|
2012-02-20 21:27:07 +01:00
|
|
|
p.stdin.write('\n')
|
|
|
|
out = p.communicate()[0]
|
|
|
|
|
|
|
|
out = str(out).split('\n')
|
|
|
|
|
|
|
|
k = {}
|
|
|
|
for line in out:
|
|
|
|
lst = shlex.split(line)
|
|
|
|
if len(lst) > 2:
|
|
|
|
key = lst[1]
|
|
|
|
val = lst[2]
|
|
|
|
k[key] = val
|
2012-06-23 03:39:10 +02:00
|
|
|
return k
|
|
|
|
|
|
|
|
|
|
|
|
def is_arch_armv7():
|
|
|
|
"""Check for ARMv7 instructions"""
|
|
|
|
cc_macros_cache = cc_macros()
|
2015-12-02 03:37:08 +01:00
|
|
|
return cc_macros_cache.get('__ARM_ARCH') == '7'
|
2012-06-23 03:39:10 +02:00
|
|
|
|
|
|
|
|
2014-07-23 15:24:07 +02:00
|
|
|
def is_arch_armv6():
|
|
|
|
"""Check for ARMv6 instructions"""
|
|
|
|
cc_macros_cache = cc_macros()
|
2015-12-02 03:37:08 +01:00
|
|
|
return cc_macros_cache.get('__ARM_ARCH') == '6'
|
2014-07-23 15:24:07 +02:00
|
|
|
|
|
|
|
|
2013-04-19 14:54:21 +02:00
|
|
|
def is_arm_hard_float_abi():
|
2012-06-23 03:39:10 +02:00
|
|
|
"""Check for hardfloat or softfloat eabi on ARM"""
|
|
|
|
# GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify
|
|
|
|
# the Floating Point ABI used (PCS stands for Procedure Call Standard).
|
|
|
|
# We use these as well as a couple of other defines to statically determine
|
|
|
|
# what FP ABI used.
|
|
|
|
|
2014-12-20 15:39:10 +01:00
|
|
|
return '__ARM_PCS_VFP' in cc_macros()
|
2012-06-23 03:39:10 +02:00
|
|
|
|
|
|
|
|
|
|
|
def host_arch_cc():
|
|
|
|
"""Host architecture check using the CC command."""
|
|
|
|
|
2015-08-12 17:53:33 +02:00
|
|
|
if sys.platform.startswith('aix'):
|
|
|
|
# we only support gcc at this point and the default on AIX
|
|
|
|
# would be xlc so hard code gcc
|
|
|
|
k = cc_macros('gcc')
|
|
|
|
else:
|
2015-12-02 05:54:02 +01:00
|
|
|
k = cc_macros(os.environ.get('CC_host'))
|
2012-02-20 21:27:07 +01:00
|
|
|
|
|
|
|
matchup = {
|
2015-03-02 21:35:29 +01:00
|
|
|
'__aarch64__' : 'arm64',
|
2012-02-20 21:27:07 +01:00
|
|
|
'__arm__' : 'arm',
|
2015-03-02 21:35:29 +01:00
|
|
|
'__i386__' : 'ia32',
|
2015-09-20 23:04:46 +02:00
|
|
|
'__MIPSEL__' : 'mipsel',
|
2013-06-12 17:47:10 +02:00
|
|
|
'__mips__' : 'mips',
|
2015-07-07 20:15:03 +02:00
|
|
|
'__PPC64__' : 'ppc64',
|
2016-11-16 17:02:57 +01:00
|
|
|
'__PPC__' : 'ppc64',
|
2015-03-02 21:35:29 +01:00
|
|
|
'__x86_64__' : 'x64',
|
2016-03-28 23:03:06 +02:00
|
|
|
'__s390__' : 's390',
|
|
|
|
'__s390x__' : 's390x',
|
2012-02-13 14:28:43 +01:00
|
|
|
}
|
|
|
|
|
2012-02-20 21:27:07 +01:00
|
|
|
rtn = 'ia32' # default
|
|
|
|
|
|
|
|
for i in matchup:
|
|
|
|
if i in k and k[i] != '0':
|
|
|
|
rtn = matchup[i]
|
2016-03-28 23:03:06 +02:00
|
|
|
if rtn != 's390':
|
|
|
|
break
|
2012-02-13 14:28:43 +01:00
|
|
|
|
2017-01-25 09:16:13 +01:00
|
|
|
if rtn == 'mipsel' and '_LP64' in k:
|
|
|
|
rtn = 'mips64el'
|
|
|
|
|
2012-02-20 21:27:07 +01:00
|
|
|
return rtn
|
2011-11-15 04:02:44 +01:00
|
|
|
|
|
|
|
|
2012-03-15 23:17:25 +01:00
|
|
|
def host_arch_win():
|
|
|
|
"""Host architecture check using environ vars (better way to do this?)"""
|
|
|
|
|
2014-07-01 09:48:28 +02:00
|
|
|
observed_arch = os.environ.get('PROCESSOR_ARCHITECTURE', 'x86')
|
|
|
|
arch = os.environ.get('PROCESSOR_ARCHITEW6432', observed_arch)
|
2012-03-15 23:17:25 +01:00
|
|
|
|
|
|
|
matchup = {
|
|
|
|
'AMD64' : 'x64',
|
|
|
|
'x86' : 'ia32',
|
|
|
|
'arm' : 'arm',
|
2013-06-12 17:47:10 +02:00
|
|
|
'mips' : 'mips',
|
2012-03-15 23:17:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return matchup.get(arch, 'ia32')
|
|
|
|
|
|
|
|
|
2012-09-19 14:37:08 +02:00
|
|
|
def configure_arm(o):
|
|
|
|
if options.arm_float_abi:
|
2013-04-19 14:54:21 +02:00
|
|
|
arm_float_abi = options.arm_float_abi
|
2013-12-07 20:49:49 +01:00
|
|
|
elif is_arm_hard_float_abi():
|
|
|
|
arm_float_abi = 'hard'
|
2012-09-19 14:37:08 +02:00
|
|
|
else:
|
2014-01-08 22:08:29 +01:00
|
|
|
arm_float_abi = 'default'
|
2014-07-23 15:24:07 +02:00
|
|
|
|
2015-12-08 21:53:06 +01:00
|
|
|
arm_fpu = 'vfp'
|
2015-09-18 11:28:19 +02:00
|
|
|
|
2014-07-23 15:24:07 +02:00
|
|
|
if is_arch_armv7():
|
2015-09-18 11:28:19 +02:00
|
|
|
arm_fpu = 'vfpv3'
|
2014-07-23 15:24:07 +02:00
|
|
|
o['variables']['arm_version'] = '7'
|
|
|
|
else:
|
2015-01-22 21:51:38 +01:00
|
|
|
o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'
|
2014-07-23 15:24:07 +02:00
|
|
|
|
2013-04-19 14:54:21 +02:00
|
|
|
o['variables']['arm_thumb'] = 0 # -marm
|
|
|
|
o['variables']['arm_float_abi'] = arm_float_abi
|
2012-09-19 14:37:08 +02:00
|
|
|
|
2015-03-09 04:19:21 +01:00
|
|
|
if options.dest_os == 'android':
|
2015-09-18 11:28:19 +02:00
|
|
|
arm_fpu = 'vfpv3'
|
2015-03-09 04:19:21 +01:00
|
|
|
o['variables']['arm_version'] = '7'
|
|
|
|
|
2015-09-18 11:28:19 +02:00
|
|
|
o['variables']['arm_fpu'] = options.arm_fpu or arm_fpu
|
|
|
|
|
2012-09-19 14:37:08 +02:00
|
|
|
|
2015-03-03 21:55:59 +01:00
|
|
|
def configure_mips(o):
|
|
|
|
can_use_fpu_instructions = (options.mips_float_abi != 'soft')
|
|
|
|
o['variables']['v8_can_use_fpu_instructions'] = b(can_use_fpu_instructions)
|
|
|
|
o['variables']['v8_use_mips_abi_hardfloat'] = b(can_use_fpu_instructions)
|
|
|
|
o['variables']['mips_arch_variant'] = options.mips_arch_variant
|
|
|
|
o['variables']['mips_fpu_mode'] = options.mips_fpu_mode
|
|
|
|
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
def configure_node(o):
|
2013-05-08 14:10:07 +02:00
|
|
|
if options.dest_os == 'android':
|
2013-08-02 11:50:45 +02:00
|
|
|
o['variables']['OS'] = 'android'
|
2015-08-05 14:44:21 +02:00
|
|
|
o['variables']['node_prefix'] = options.prefix
|
2011-12-17 09:09:14 +01:00
|
|
|
o['variables']['node_install_npm'] = b(not options.without_npm)
|
2012-01-18 10:37:02 +01:00
|
|
|
o['default_configuration'] = 'Debug' if options.debug else 'Release'
|
2011-11-15 04:02:44 +01:00
|
|
|
|
2012-07-12 16:29:43 +02:00
|
|
|
host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
|
|
|
|
target_arch = options.dest_cpu or host_arch
|
2015-06-10 09:05:26 +02:00
|
|
|
# ia32 is preferred by the build tools (GYP) over x86 even if we prefer the latter
|
|
|
|
# the Makefile resets this to x86 afterward
|
|
|
|
if target_arch == 'x86':
|
|
|
|
target_arch = 'ia32'
|
2012-07-12 16:29:43 +02:00
|
|
|
o['variables']['host_arch'] = host_arch
|
|
|
|
o['variables']['target_arch'] = target_arch
|
2015-07-07 20:15:03 +02:00
|
|
|
o['variables']['node_byteorder'] = sys.byteorder
|
2012-07-12 16:29:43 +02:00
|
|
|
|
2016-12-26 14:29:25 +01:00
|
|
|
cross_compiling = (options.cross_compiling
|
|
|
|
if options.cross_compiling is not None
|
|
|
|
else target_arch != host_arch)
|
2017-07-18 14:38:43 +02:00
|
|
|
want_snapshots = not options.without_snapshot
|
2015-05-08 20:56:13 +02:00
|
|
|
o['variables']['want_separate_host_toolset'] = int(
|
|
|
|
cross_compiling and want_snapshots)
|
2014-05-16 01:11:51 +02:00
|
|
|
|
2012-07-12 16:29:43 +02:00
|
|
|
if target_arch == 'arm':
|
2012-09-19 14:37:08 +02:00
|
|
|
configure_arm(o)
|
2017-01-25 09:16:13 +01:00
|
|
|
elif target_arch in ('mips', 'mipsel', 'mips64el'):
|
2015-03-03 21:55:59 +01:00
|
|
|
configure_mips(o)
|
2012-06-26 02:54:11 +02:00
|
|
|
|
2015-09-29 16:22:00 +02:00
|
|
|
if flavor == 'aix':
|
|
|
|
o['variables']['node_target_type'] = 'static_library'
|
|
|
|
|
2015-10-21 18:24:12 +02:00
|
|
|
if target_arch in ('x86', 'x64', 'ia32', 'x32'):
|
|
|
|
o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling)
|
|
|
|
elif options.enable_vtune_profiling:
|
|
|
|
raise Exception(
|
2017-12-05 04:57:00 +01:00
|
|
|
'The VTune profiler for JavaScript is only supported on x32, x86, and x64 '
|
2015-12-08 10:35:49 +01:00
|
|
|
'architectures.')
|
2015-10-21 18:24:12 +02:00
|
|
|
else:
|
|
|
|
o['variables']['node_enable_v8_vtunejit'] = 'false'
|
|
|
|
|
2014-03-02 20:54:19 +01:00
|
|
|
if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
|
2013-10-28 20:18:59 +01:00
|
|
|
use_dtrace = not options.without_dtrace
|
2014-03-02 20:54:19 +01:00
|
|
|
# Don't enable by default on linux and freebsd
|
|
|
|
if flavor in ('linux', 'freebsd'):
|
|
|
|
use_dtrace = options.with_dtrace
|
|
|
|
|
2013-10-28 20:18:59 +01:00
|
|
|
if flavor == 'linux':
|
|
|
|
if options.systemtap_includes:
|
|
|
|
o['include_dirs'] += [options.systemtap_includes]
|
|
|
|
o['variables']['node_use_dtrace'] = b(use_dtrace)
|
|
|
|
o['variables']['uv_use_dtrace'] = b(use_dtrace)
|
2013-04-17 01:18:07 +02:00
|
|
|
o['variables']['uv_parent_path'] = '/deps/uv/'
|
2012-11-21 00:27:22 +01:00
|
|
|
elif options.with_dtrace:
|
2012-10-10 00:09:07 +02:00
|
|
|
raise Exception(
|
2013-05-21 18:26:42 +02:00
|
|
|
'DTrace is currently only supported on SunOS, MacOS or Linux systems.')
|
2012-03-28 19:26:10 +02:00
|
|
|
else:
|
|
|
|
o['variables']['node_use_dtrace'] = 'false'
|
|
|
|
|
2015-01-22 13:35:16 +01:00
|
|
|
# Enable Lttng if --with-lttng was defined. Use logic similar to
|
|
|
|
# ETW for windows. Lttng is only available on the Linux platform.
|
|
|
|
if flavor == 'linux':
|
|
|
|
o['variables']['node_use_lttng'] = b(options.with_lttng)
|
|
|
|
elif options.with_lttng:
|
|
|
|
raise Exception('lttng is only supported on Linux.')
|
|
|
|
else:
|
|
|
|
o['variables']['node_use_lttng'] = 'false'
|
|
|
|
|
2012-06-30 04:27:29 +02:00
|
|
|
if options.no_ifaddrs:
|
|
|
|
o['defines'] += ['SUNOS_NO_IFADDRS']
|
2011-11-15 04:02:44 +01:00
|
|
|
|
2012-06-12 01:23:17 +02:00
|
|
|
# By default, enable ETW on Windows.
|
2013-05-21 18:26:42 +02:00
|
|
|
if flavor == 'win':
|
2013-08-02 11:50:45 +02:00
|
|
|
o['variables']['node_use_etw'] = b(not options.without_etw)
|
2012-11-21 00:27:22 +01:00
|
|
|
elif options.with_etw:
|
2012-06-12 01:23:17 +02:00
|
|
|
raise Exception('ETW is only supported on Windows.')
|
|
|
|
else:
|
|
|
|
o['variables']['node_use_etw'] = 'false'
|
|
|
|
|
2012-11-21 00:27:22 +01:00
|
|
|
# By default, enable Performance counters on Windows.
|
2013-05-21 18:26:42 +02:00
|
|
|
if flavor == 'win':
|
2013-08-02 11:50:45 +02:00
|
|
|
o['variables']['node_use_perfctr'] = b(not options.without_perfctr)
|
2012-11-21 00:27:22 +01:00
|
|
|
elif options.with_perfctr:
|
|
|
|
raise Exception('Performance counter is only supported on Windows.')
|
|
|
|
else:
|
|
|
|
o['variables']['node_use_perfctr'] = 'false'
|
|
|
|
|
2012-12-27 05:35:00 +01:00
|
|
|
if options.tag:
|
|
|
|
o['variables']['node_tag'] = '-' + options.tag
|
|
|
|
else:
|
|
|
|
o['variables']['node_tag'] = ''
|
2012-12-21 02:56:47 +01:00
|
|
|
|
2015-01-18 07:41:37 +01:00
|
|
|
o['variables']['node_release_urlbase'] = options.release_urlbase or ''
|
|
|
|
|
2014-03-26 21:30:49 +01:00
|
|
|
if options.v8_options:
|
2014-03-31 14:22:49 +02:00
|
|
|
o['variables']['node_v8_options'] = options.v8_options.replace('"', '\\"')
|
2014-03-26 21:30:49 +01:00
|
|
|
|
2015-04-04 16:04:49 +02:00
|
|
|
if options.enable_static:
|
|
|
|
o['variables']['node_target_type'] = 'static_library'
|
|
|
|
|
http2: introducing HTTP/2
At long last: The initial *experimental* implementation of HTTP/2.
This is an accumulation of the work that has been done in the nodejs/http2
repository, squashed down to a couple of commits. The original commit
history has been preserved in the nodejs/http2 repository.
This PR introduces the nghttp2 C library as a new dependency. This library
provides the majority of the HTTP/2 protocol implementation, with the rest
of the code here providing the mapping of the library into a usable JS API.
Within src, a handful of new node_http2_*.c and node_http2_*.h files are
introduced. These provide the internal mechanisms that interface with nghttp
and define the `process.binding('http2')` interface.
The JS API is defined within `internal/http2/*.js`.
There are two APIs provided: Core and Compat.
The Core API is HTTP/2 specific and is designed to be as minimal and as
efficient as possible.
The Compat API is intended to be as close to the existing HTTP/1 API as
possible, with some exceptions.
Tests, documentation and initial benchmarks are included.
The `http2` module is gated by a new `--expose-http2` command line flag.
When used, `require('http2')` will be exposed to users. Note that there
is an existing `http2` module on npm that would be impacted by the introduction
of this module, which is the main reason for gating this behind a flag.
When using `require('http2')` the first time, a process warning will be
emitted indicating that an experimental feature is being used.
To run the benchmarks, the `h2load` tool (part of the nghttp project) is
required: `./node benchmarks/http2/simple.js benchmarker=h2load`. Only
two benchmarks are currently available.
Additional configuration options to enable verbose debugging are provided:
```
$ ./configure --debug-http2 --debug-nghttp2
$ NODE_DEBUG=http2 ./node
```
The `--debug-http2` configuration option enables verbose debug statements
from the `src/node_http2_*` files. The `--debug-nghttp2` enables the nghttp
library's own verbose debug output. The `NODE_DEBUG=http2` enables JS-level
debug output.
The following illustrates as simple HTTP/2 server and client interaction:
(The HTTP/2 client and server support both plain text and TLS connections)
```jt client = http2.connect('http://localhost:80');
const req = client.request({ ':path': '/some/path' });
req.on('data', (chunk) => { /* do something with the data */ });
req.on('end', () => {
client.destroy();
});
// Plain text (non-TLS server)
const server = http2.createServer();
server.on('stream', (stream, requestHeaders) => {
stream.respond({ ':status': 200 });
stream.write('hello ');
stream.end('world');
});
server.listen(80);
```
```js
const http2 = require('http2');
const client = http2.connect('http://localhost');
```
Author: Anna Henningsen <anna@addaleax.net>
Author: Colin Ihrig <cjihrig@gmail.com>
Author: Daniel Bevenius <daniel.bevenius@gmail.com>
Author: James M Snell <jasnell@gmail.com>
Author: Jun Mukai
Author: Kelvin Jin
Author: Matteo Collina <matteo.collina@gmail.com>
Author: Robert Kowalski <rok@kowalski.gd>
Author: Santiago Gimeno <santiago.gimeno@gmail.com>
Author: Sebastiaan Deckers <sebdeckers83@gmail.com>
Author: Yosuke Furukawa <yosuke.furukawa@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/14239
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
2017-07-17 19:17:16 +02:00
|
|
|
if options.debug_http2:
|
|
|
|
o['variables']['debug_http2'] = 1
|
|
|
|
else:
|
|
|
|
o['variables']['debug_http2'] = 'false'
|
|
|
|
|
|
|
|
if options.debug_nghttp2:
|
|
|
|
o['variables']['debug_nghttp2'] = 1
|
|
|
|
else:
|
|
|
|
o['variables']['debug_nghttp2'] = 'false'
|
|
|
|
|
2016-03-23 02:05:54 +01:00
|
|
|
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
2016-03-27 01:17:55 +01:00
|
|
|
o['variables']['node_shared'] = b(options.shared)
|
2016-07-12 20:04:29 +02:00
|
|
|
node_module_version = getmoduleversion.get_version()
|
2016-11-14 14:43:41 +01:00
|
|
|
|
|
|
|
if sys.platform == 'darwin':
|
|
|
|
shlib_suffix = '%s.dylib'
|
|
|
|
elif sys.platform.startswith('aix'):
|
|
|
|
shlib_suffix = '%s.a'
|
|
|
|
else:
|
|
|
|
shlib_suffix = 'so.%s'
|
|
|
|
|
2016-07-12 20:04:29 +02:00
|
|
|
shlib_suffix %= node_module_version
|
|
|
|
o['variables']['node_module_version'] = int(node_module_version)
|
|
|
|
o['variables']['shlib_suffix'] = shlib_suffix
|
2016-03-23 02:05:54 +01:00
|
|
|
|
2015-08-22 20:36:03 +02:00
|
|
|
if options.linked_module:
|
|
|
|
o['variables']['library_files'] = options.linked_module
|
|
|
|
|
2015-08-14 10:07:18 +02:00
|
|
|
o['variables']['asan'] = int(options.enable_asan or 0)
|
2016-06-14 16:47:54 +02:00
|
|
|
o['variables']['debug_devtools'] = 'node'
|
2012-06-12 01:23:17 +02:00
|
|
|
|
2016-05-16 03:51:07 +02:00
|
|
|
if options.use_xcode and options.use_ninja:
|
|
|
|
raise Exception('--xcode and --ninja cannot be used together.')
|
|
|
|
|
2016-10-14 14:33:25 +02:00
|
|
|
if options.coverage:
|
|
|
|
o['variables']['coverage'] = 'true'
|
|
|
|
else:
|
|
|
|
o['variables']['coverage'] = 'false'
|
|
|
|
|
2017-12-05 01:07:53 +01:00
|
|
|
if options.shared:
|
|
|
|
o['variables']['node_target_type'] = 'shared_library'
|
|
|
|
elif options.enable_static:
|
|
|
|
o['variables']['node_target_type'] = 'static_library'
|
|
|
|
else:
|
|
|
|
o['variables']['node_target_type'] = 'executable'
|
|
|
|
|
2015-05-04 05:57:17 +02:00
|
|
|
def configure_library(lib, output):
|
|
|
|
shared_lib = 'shared_' + lib
|
|
|
|
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
|
|
|
|
|
|
|
|
if getattr(options, shared_lib):
|
|
|
|
(pkg_libs, pkg_cflags, pkg_libpath) = pkg_config(lib)
|
2015-06-15 22:04:14 +02:00
|
|
|
|
2016-10-30 13:40:54 +01:00
|
|
|
if options.__dict__[shared_lib + '_includes']:
|
|
|
|
output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
|
|
|
|
elif pkg_cflags:
|
2015-06-15 22:04:14 +02:00
|
|
|
output['include_dirs'] += (
|
|
|
|
filter(None, map(str.strip, pkg_cflags.split('-I'))))
|
2015-05-04 05:57:17 +02:00
|
|
|
|
|
|
|
# libpath needs to be provided ahead libraries
|
2016-10-30 13:40:54 +01:00
|
|
|
if options.__dict__[shared_lib + '_libpath']:
|
2015-09-30 20:27:17 +02:00
|
|
|
output['libraries'] += [
|
|
|
|
'-L%s' % options.__dict__[shared_lib + '_libpath']]
|
2016-10-30 13:40:54 +01:00
|
|
|
elif pkg_libpath:
|
|
|
|
output['libraries'] += [pkg_libpath]
|
2015-06-15 22:04:14 +02:00
|
|
|
|
|
|
|
default_libs = getattr(options, shared_lib + '_libname')
|
|
|
|
default_libs = map('-l{0}'.format, default_libs.split(','))
|
|
|
|
|
2016-10-30 13:40:54 +01:00
|
|
|
if default_libs:
|
2015-06-15 22:04:14 +02:00
|
|
|
output['libraries'] += default_libs
|
2016-10-30 13:40:54 +01:00
|
|
|
elif pkg_libs:
|
|
|
|
output['libraries'] += pkg_libs.split()
|
2012-10-24 01:54:22 +02:00
|
|
|
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
def configure_v8(o):
|
2013-11-10 02:02:27 +01:00
|
|
|
o['variables']['v8_enable_gdbjit'] = 1 if options.gdb else 0
|
|
|
|
o['variables']['v8_no_strict_aliasing'] = 1 # Work around compiler bugs.
|
|
|
|
o['variables']['v8_optimized_debug'] = 0 # Compile with -O0 in debug builds.
|
|
|
|
o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables.
|
2017-05-25 20:51:56 +02:00
|
|
|
o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
|
2017-07-18 14:38:43 +02:00
|
|
|
o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'
|
2017-07-01 02:08:32 +02:00
|
|
|
o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
|
2016-07-05 16:18:38 +02:00
|
|
|
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
|
|
|
|
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
|
2016-06-29 22:03:18 +02:00
|
|
|
o['variables']['force_dynamic_crt'] = 1 if options.shared else 0
|
2016-07-05 16:18:38 +02:00
|
|
|
o['variables']['node_enable_d8'] = b(options.enable_d8)
|
2017-09-14 12:51:54 +02:00
|
|
|
# Unconditionally force typed arrays to allocate outside the v8 heap. This
|
|
|
|
# is to prevent memory pointers from being moved around that are returned by
|
|
|
|
# Buffer::Data().
|
|
|
|
o['variables']['v8_typed_array_max_size_in_heap'] = 0
|
2016-07-05 16:18:38 +02:00
|
|
|
if options.enable_d8:
|
|
|
|
o['variables']['test_isolation_mode'] = 'noop' # Needed by d8.gyp.
|
|
|
|
if options.without_bundled_v8 and options.enable_d8:
|
|
|
|
raise Exception('--enable-d8 is incompatible with --without-bundled-v8.')
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
|
|
|
|
def configure_openssl(o):
|
2011-11-29 16:27:52 +01:00
|
|
|
o['variables']['node_use_openssl'] = b(not options.without_ssl)
|
2012-06-30 04:27:29 +02:00
|
|
|
o['variables']['node_shared_openssl'] = b(options.shared_openssl)
|
2015-05-04 05:57:17 +02:00
|
|
|
o['variables']['openssl_no_asm'] = 1 if options.openssl_no_asm else 0
|
2016-12-21 11:16:38 +01:00
|
|
|
if options.use_openssl_ca_store:
|
|
|
|
o['defines'] += ['NODE_OPENSSL_CERT_STORE']
|
2017-11-06 10:30:29 +01:00
|
|
|
if options.openssl_system_ca_path:
|
|
|
|
o['variables']['openssl_system_ca_path'] = options.openssl_system_ca_path
|
2017-02-20 15:18:43 +01:00
|
|
|
o['variables']['node_without_node_options'] = b(options.without_node_options)
|
|
|
|
if options.without_node_options:
|
|
|
|
o['defines'] += ['NODE_WITHOUT_NODE_OPTIONS']
|
2015-06-01 23:49:43 +02:00
|
|
|
if options.openssl_fips:
|
|
|
|
o['variables']['openssl_fips'] = options.openssl_fips
|
2017-11-26 14:30:08 +01:00
|
|
|
fips_dir = os.path.join('deps', 'openssl', 'fips')
|
2015-06-01 23:49:43 +02:00
|
|
|
fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld'))
|
2017-07-14 00:05:54 +02:00
|
|
|
# LINK is for Makefiles, LD/LDXX is for ninja
|
2015-11-25 01:17:49 +01:00
|
|
|
o['make_fips_settings'] = [
|
2015-06-01 23:49:43 +02:00
|
|
|
['LINK', fips_ld + ' <(openssl_fips)/bin/fipsld'],
|
2017-07-14 00:05:54 +02:00
|
|
|
['LD', fips_ld + ' <(openssl_fips)/bin/fipsld'],
|
|
|
|
['LDXX', fips_ld + ' <(openssl_fips)/bin/fipsld'],
|
2015-06-01 23:49:43 +02:00
|
|
|
]
|
|
|
|
else:
|
|
|
|
o['variables']['openssl_fips'] = ''
|
2017-06-21 10:20:56 +02:00
|
|
|
try:
|
|
|
|
os.remove('config_fips.gypi')
|
|
|
|
except OSError:
|
|
|
|
pass
|
2011-11-15 04:02:44 +01:00
|
|
|
|
|
|
|
if options.without_ssl:
|
2017-04-03 07:49:59 +02:00
|
|
|
def without_ssl_error(option):
|
|
|
|
print('Error: --without-ssl is incompatible with %s' % option)
|
|
|
|
exit(1)
|
|
|
|
if options.shared_openssl:
|
|
|
|
without_ssl_error('--shared-openssl')
|
|
|
|
if options.openssl_no_asm:
|
|
|
|
without_ssl_error('--openssl-no-asm')
|
|
|
|
if options.openssl_fips:
|
|
|
|
without_ssl_error('--openssl-fips')
|
2011-11-15 04:02:44 +01:00
|
|
|
return
|
2015-05-04 05:57:17 +02:00
|
|
|
configure_library('openssl', o)
|
2011-11-15 04:02:44 +01:00
|
|
|
|
|
|
|
|
2015-12-04 09:14:24 +01:00
|
|
|
def configure_static(o):
|
|
|
|
if options.fully_static or options.partly_static:
|
2014-08-23 23:01:06 +02:00
|
|
|
if flavor == 'mac':
|
|
|
|
print("Generation of static executable will not work on OSX "
|
2015-12-04 09:14:24 +01:00
|
|
|
"when using the default compilation environment")
|
|
|
|
return
|
|
|
|
|
|
|
|
if options.fully_static:
|
|
|
|
o['libraries'] += ['-static']
|
|
|
|
elif options.partly_static:
|
|
|
|
o['libraries'] += ['-static-libgcc', '-static-libstdc++']
|
|
|
|
if options.enable_asan:
|
|
|
|
o['libraries'] += ['-static-libasan']
|
2014-08-23 23:01:06 +02:00
|
|
|
|
|
|
|
|
2014-10-04 02:42:37 +02:00
|
|
|
def write(filename, data):
|
2017-11-26 14:30:08 +01:00
|
|
|
filename = filename
|
2016-11-17 07:57:04 +01:00
|
|
|
print('creating %s' % filename)
|
2014-10-04 02:42:37 +02:00
|
|
|
f = open(filename, 'w+')
|
|
|
|
f.write(data)
|
|
|
|
|
|
|
|
do_not_edit = '# Do not edit. Generated by the configure script.\n'
|
|
|
|
|
2015-08-01 01:25:15 +02:00
|
|
|
def glob_to_var(dir_base, dir_sub, patch_dir):
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
list = []
|
2016-04-09 04:03:24 +02:00
|
|
|
dir_all = '%s/%s' % (dir_base, dir_sub)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
files = os.walk(dir_all)
|
|
|
|
for ent in files:
|
|
|
|
(path, dirs, files) = ent
|
|
|
|
for file in files:
|
|
|
|
if file.endswith('.cpp') or file.endswith('.c') or file.endswith('.h'):
|
2015-08-01 01:25:15 +02:00
|
|
|
# srcfile uses "slash" as dir separator as its output is consumed by gyp
|
|
|
|
srcfile = '%s/%s' % (dir_sub, file)
|
|
|
|
if patch_dir:
|
|
|
|
patchfile = '%s/%s/%s' % (dir_base, patch_dir, file)
|
|
|
|
if os.path.isfile(patchfile):
|
|
|
|
srcfile = '%s/%s' % (patch_dir, file)
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Using version-specific floating patch %s' % patchfile)
|
2015-08-01 01:25:15 +02:00
|
|
|
list.append(srcfile)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
break
|
|
|
|
return list
|
|
|
|
|
|
|
|
def configure_intl(o):
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
icus = [
|
|
|
|
{
|
2017-12-14 20:26:30 +01:00
|
|
|
'url': 'https://ssl.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.zip',
|
|
|
|
'md5': '115908818fd0324530b2acb1b029738d',
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
},
|
|
|
|
]
|
|
|
|
def icu_download(path):
|
|
|
|
# download ICU, if needed
|
2015-10-06 08:09:06 +02:00
|
|
|
if not os.access(options.download_path, os.W_OK):
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Error: cannot write to desired download path. ' \
|
|
|
|
'Either create it or verify permissions.')
|
2015-10-06 08:09:06 +02:00
|
|
|
sys.exit(1)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
for icu in icus:
|
|
|
|
url = icu['url']
|
|
|
|
md5 = icu['md5']
|
|
|
|
local = url.split('/')[-1]
|
2015-10-06 08:09:06 +02:00
|
|
|
targetfile = os.path.join(options.download_path, local)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
if not os.path.isfile(targetfile):
|
|
|
|
if nodedownload.candownload(auto_downloads, "icu"):
|
|
|
|
nodedownload.retrievefile(url, targetfile)
|
|
|
|
else:
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Re-using existing %s' % targetfile)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
if os.path.isfile(targetfile):
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Checking file integrity with MD5:\r')
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
gotmd5 = nodedownload.md5sum(targetfile)
|
2017-04-03 08:17:07 +02:00
|
|
|
print('MD5: %s %s' % (gotmd5, targetfile))
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
if (md5 == gotmd5):
|
|
|
|
return targetfile
|
|
|
|
else:
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Expected: %s *MISMATCH*' % md5)
|
2016-11-17 07:57:04 +01:00
|
|
|
print('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
return None
|
2014-10-04 02:42:37 +02:00
|
|
|
icu_config = {
|
|
|
|
'variables': {}
|
|
|
|
}
|
|
|
|
icu_config_name = 'icu_config.gypi'
|
|
|
|
def write_config(data, name):
|
|
|
|
return
|
|
|
|
|
|
|
|
# write an empty file to start with
|
|
|
|
write(icu_config_name, do_not_edit +
|
|
|
|
pprint.pformat(icu_config, indent=2) + '\n')
|
|
|
|
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
# always set icu_small, node.gyp depends on it being defined.
|
|
|
|
o['variables']['icu_small'] = b(False)
|
|
|
|
|
|
|
|
with_intl = options.with_intl
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
with_icu_source = options.with_icu_source
|
2013-11-21 17:13:58 +01:00
|
|
|
have_icu_path = bool(options.with_icu_path)
|
2015-04-27 06:45:55 +02:00
|
|
|
if have_icu_path and with_intl != 'none':
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Error: Cannot specify both --with-icu-path and --with-intl')
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
sys.exit(1)
|
|
|
|
elif have_icu_path:
|
|
|
|
# Chromium .gyp mode: --with-icu-path
|
|
|
|
o['variables']['v8_enable_i18n_support'] = 1
|
|
|
|
# use the .gyp given
|
2013-11-21 17:13:58 +01:00
|
|
|
o['variables']['icu_gyp_path'] = options.with_icu_path
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
return
|
|
|
|
# --with-intl=<with_intl>
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# set the default
|
2015-04-03 06:33:34 +02:00
|
|
|
if with_intl in (None, 'none'):
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
o['variables']['v8_enable_i18n_support'] = 0
|
|
|
|
return # no Intl
|
|
|
|
elif with_intl == 'small-icu':
|
|
|
|
# small ICU (English only)
|
|
|
|
o['variables']['v8_enable_i18n_support'] = 1
|
|
|
|
o['variables']['icu_small'] = b(True)
|
2015-04-03 06:33:34 +02:00
|
|
|
locs = set(options.with_icu_locales.split(','))
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
locs.add('root') # must have root
|
|
|
|
o['variables']['icu_locales'] = string.join(locs,',')
|
2016-04-09 04:03:24 +02:00
|
|
|
# We will check a bit later if we can use the canned deps/icu-small
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
elif with_intl == 'full-icu':
|
|
|
|
# full ICU
|
|
|
|
o['variables']['v8_enable_i18n_support'] = 1
|
|
|
|
elif with_intl == 'system-icu':
|
|
|
|
# ICU from pkg-config.
|
|
|
|
o['variables']['v8_enable_i18n_support'] = 1
|
|
|
|
pkgicu = pkg_config('icu-i18n')
|
2015-05-04 05:57:17 +02:00
|
|
|
if pkgicu[0] is None:
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Error: could not load pkg-config data for "icu-i18n".')
|
|
|
|
print('See above errors or the README.md.')
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
sys.exit(1)
|
2015-05-04 05:57:17 +02:00
|
|
|
(libs, cflags, libpath) = pkgicu
|
|
|
|
# libpath provides linker path which may contain spaces
|
2015-05-25 05:10:14 +02:00
|
|
|
if libpath:
|
|
|
|
o['libraries'] += [libpath]
|
2015-05-04 05:57:17 +02:00
|
|
|
# safe to split, cannot contain spaces
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
o['libraries'] += libs.split()
|
2015-05-25 05:10:14 +02:00
|
|
|
if cflags:
|
|
|
|
o['include_dirs'] += filter(None, map(str.strip, cflags.split('-I')))
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
# use the "system" .gyp
|
|
|
|
o['variables']['icu_gyp_path'] = 'tools/icu/icu-system.gyp'
|
|
|
|
return
|
|
|
|
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# this is just the 'deps' dir. Used for unpacking.
|
2017-11-26 14:30:08 +01:00
|
|
|
icu_parent_path = 'deps'
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
|
2016-04-09 04:03:24 +02:00
|
|
|
# The full path to the ICU source directory. Should not include './'.
|
|
|
|
icu_full_path = 'deps/icu'
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
|
|
|
|
# icu-tmp is used to download and unpack the ICU tarball.
|
|
|
|
icu_tmp_path = os.path.join(icu_parent_path, 'icu-tmp')
|
|
|
|
|
2016-04-09 04:03:24 +02:00
|
|
|
# canned ICU. see tools/icu/README.md to update.
|
|
|
|
canned_icu_dir = 'deps/icu-small'
|
|
|
|
|
|
|
|
# We can use 'deps/icu-small' - pre-canned ICU *iff*
|
|
|
|
# - with_intl == small-icu (the default!)
|
|
|
|
# - with_icu_locales == 'root,en' (the default!)
|
|
|
|
# - deps/icu-small exists!
|
|
|
|
# - with_icu_source is unset (i.e. no other ICU was specified)
|
|
|
|
# (Note that this is the *DEFAULT CASE*.)
|
|
|
|
#
|
|
|
|
# This is *roughly* equivalent to
|
|
|
|
# $ configure --with-intl=small-icu --with-icu-source=deps/icu-small
|
|
|
|
# .. Except that we avoid copying icu-small over to deps/icu.
|
|
|
|
# In this default case, deps/icu is ignored, although make clean will
|
|
|
|
# still harmlessly remove deps/icu.
|
|
|
|
|
|
|
|
# are we using default locales?
|
|
|
|
using_default_locales = ( options.with_icu_locales == icu_default_locales )
|
|
|
|
|
|
|
|
# make sure the canned ICU really exists
|
|
|
|
canned_icu_available = os.path.isdir(canned_icu_dir)
|
|
|
|
|
|
|
|
if (o['variables']['icu_small'] == b(True)) and using_default_locales and (not with_icu_source) and canned_icu_available:
|
|
|
|
# OK- we can use the canned ICU.
|
|
|
|
icu_config['variables']['icu_small_canned'] = 1
|
|
|
|
icu_full_path = canned_icu_dir
|
|
|
|
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# --with-icu-source processing
|
2016-04-09 04:03:24 +02:00
|
|
|
# now, check that they didn't pass --with-icu-source=deps/icu
|
|
|
|
elif with_icu_source and os.path.abspath(icu_full_path) == os.path.abspath(with_icu_source):
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Ignoring redundant --with-icu-source=%s' % with_icu_source)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
with_icu_source = None
|
|
|
|
# if with_icu_source is still set, try to use it.
|
|
|
|
if with_icu_source:
|
|
|
|
if os.path.isdir(icu_full_path):
|
2016-11-17 07:57:04 +01:00
|
|
|
print('Deleting old ICU source: %s' % icu_full_path)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
shutil.rmtree(icu_full_path)
|
|
|
|
# now, what path was given?
|
|
|
|
if os.path.isdir(with_icu_source):
|
|
|
|
# it's a path. Copy it.
|
2016-11-17 07:57:04 +01:00
|
|
|
print('%s -> %s' % (with_icu_source, icu_full_path))
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
shutil.copytree(with_icu_source, icu_full_path)
|
|
|
|
else:
|
|
|
|
# could be file or URL.
|
|
|
|
# Set up temporary area
|
|
|
|
if os.path.isdir(icu_tmp_path):
|
|
|
|
shutil.rmtree(icu_tmp_path)
|
|
|
|
os.mkdir(icu_tmp_path)
|
|
|
|
icu_tarball = None
|
|
|
|
if os.path.isfile(with_icu_source):
|
|
|
|
# it's a file. Try to unpack it.
|
|
|
|
icu_tarball = with_icu_source
|
|
|
|
else:
|
|
|
|
# Can we download it?
|
|
|
|
local = os.path.join(icu_tmp_path, with_icu_source.split('/')[-1]) # local part
|
|
|
|
icu_tarball = nodedownload.retrievefile(with_icu_source, local)
|
|
|
|
# continue with "icu_tarball"
|
|
|
|
nodedownload.unpack(icu_tarball, icu_tmp_path)
|
|
|
|
# Did it unpack correctly? Should contain 'icu'
|
|
|
|
tmp_icu = os.path.join(icu_tmp_path, 'icu')
|
|
|
|
if os.path.isdir(tmp_icu):
|
|
|
|
os.rename(tmp_icu, icu_full_path)
|
|
|
|
shutil.rmtree(icu_tmp_path)
|
|
|
|
else:
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Error: --with-icu-source=%s did not result in an "icu" dir.' % \
|
2016-11-17 07:57:04 +01:00
|
|
|
with_icu_source)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
shutil.rmtree(icu_tmp_path)
|
|
|
|
sys.exit(1)
|
|
|
|
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
# ICU mode. (icu-generic.gyp)
|
|
|
|
o['variables']['icu_gyp_path'] = 'tools/icu/icu-generic.gyp'
|
2016-04-09 04:03:24 +02:00
|
|
|
# ICU source dir relative to tools/icu (for .gyp file)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
o['variables']['icu_path'] = icu_full_path
|
|
|
|
if not os.path.isdir(icu_full_path):
|
2016-11-17 07:57:04 +01:00
|
|
|
print('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
# can we download (or find) a zipfile?
|
|
|
|
localzip = icu_download(icu_full_path)
|
|
|
|
if localzip:
|
|
|
|
nodedownload.unpack(localzip, icu_parent_path)
|
|
|
|
if not os.path.isdir(icu_full_path):
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Cannot build Intl without ICU in %s.' % icu_full_path)
|
|
|
|
print('(Fix, or disable with "--with-intl=none" )')
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
sys.exit(1)
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
2014-11-13 02:13:14 +01:00
|
|
|
else:
|
2016-11-17 07:57:04 +01:00
|
|
|
print('* Using ICU in %s' % icu_full_path)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
# Now, what version of ICU is it? We just need the "major", such as 54.
|
|
|
|
# uvernum.h contains it as a #define.
|
|
|
|
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
|
|
|
|
if not os.path.isfile(uvernum_h):
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Error: could not load %s - is ICU installed?' % uvernum_h)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
sys.exit(1)
|
|
|
|
icu_ver_major = None
|
|
|
|
matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*'
|
|
|
|
match_version = re.compile(matchVerExp)
|
|
|
|
for line in open(uvernum_h).readlines():
|
|
|
|
m = match_version.match(line)
|
|
|
|
if m:
|
|
|
|
icu_ver_major = m.group(1)
|
|
|
|
if not icu_ver_major:
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
sys.exit(1)
|
2016-02-05 06:05:17 +01:00
|
|
|
icu_endianness = sys.byteorder[0];
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
o['variables']['icu_ver_major'] = icu_ver_major
|
|
|
|
o['variables']['icu_endianness'] = icu_endianness
|
|
|
|
icu_data_file_l = 'icudt%s%s.dat' % (icu_ver_major, 'l')
|
|
|
|
icu_data_file = 'icudt%s%s.dat' % (icu_ver_major, icu_endianness)
|
|
|
|
# relative to configure
|
|
|
|
icu_data_path = os.path.join(icu_full_path,
|
|
|
|
'source/data/in',
|
|
|
|
icu_data_file_l)
|
|
|
|
# relative to dep..
|
2016-04-09 04:03:24 +02:00
|
|
|
icu_data_in = os.path.join('..','..', icu_full_path, 'source/data/in', icu_data_file_l)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
if not os.path.isfile(icu_data_path) and icu_endianness != 'l':
|
|
|
|
# use host endianness
|
|
|
|
icu_data_path = os.path.join(icu_full_path,
|
|
|
|
'source/data/in',
|
|
|
|
icu_data_file)
|
|
|
|
# relative to dep..
|
2016-04-09 04:03:24 +02:00
|
|
|
icu_data_in = os.path.join('..', icu_full_path, 'source/data/in',
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
icu_data_file)
|
|
|
|
# this is the input '.dat' file to use .. icudt*.dat
|
|
|
|
# may be little-endian if from a icu-project.org tarball
|
|
|
|
o['variables']['icu_data_in'] = icu_data_in
|
|
|
|
# this is the icudt*.dat file which node will be using (platform endianness)
|
|
|
|
o['variables']['icu_data_file'] = icu_data_file
|
|
|
|
if not os.path.isfile(icu_data_path):
|
2017-04-03 08:17:07 +02:00
|
|
|
print('Error: ICU prebuilt data file %s does not exist.' % icu_data_path)
|
|
|
|
print('See the README.md.')
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
# .. and we're not about to build it from .gyp!
|
|
|
|
sys.exit(1)
|
|
|
|
# map from variable name to subdirs
|
|
|
|
icu_src = {
|
|
|
|
'stubdata': 'stubdata',
|
|
|
|
'common': 'common',
|
|
|
|
'i18n': 'i18n',
|
|
|
|
'tools': 'tools/toolutil',
|
|
|
|
'genccode': 'tools/genccode',
|
|
|
|
'genrb': 'tools/genrb',
|
|
|
|
'icupkg': 'tools/icupkg',
|
|
|
|
}
|
|
|
|
# this creates a variable icu_src_XXX for each of the subdirs
|
|
|
|
# with a list of the src files to use
|
|
|
|
for i in icu_src:
|
|
|
|
var = 'icu_src_%s' % i
|
2016-04-09 04:03:24 +02:00
|
|
|
path = '../../%s/source/%s' % (icu_full_path, icu_src[i])
|
2015-08-01 01:25:15 +02:00
|
|
|
icu_config['variables'][var] = glob_to_var('tools/icu', path, 'patches/%s/source/%s' % (icu_ver_major, icu_src[i]) )
|
2014-10-04 02:42:37 +02:00
|
|
|
# write updated icu_config.gypi with a bunch of paths
|
|
|
|
write(icu_config_name, do_not_edit +
|
|
|
|
pprint.pformat(icu_config, indent=2) + '\n')
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
return # end of configure_intl
|
2013-11-21 17:13:58 +01:00
|
|
|
|
2016-10-06 00:11:48 +02:00
|
|
|
def configure_inspector(o):
|
|
|
|
disable_inspector = (options.without_inspector or
|
|
|
|
options.with_intl in (None, 'none') or
|
|
|
|
options.without_ssl)
|
2017-01-17 20:49:26 +01:00
|
|
|
o['variables']['v8_enable_inspector'] = 0 if disable_inspector else 1
|
2016-10-06 00:11:48 +02:00
|
|
|
|
2017-10-07 01:49:45 +02:00
|
|
|
|
2017-10-21 02:19:46 +02:00
|
|
|
def make_bin_override():
|
|
|
|
if sys.platform == 'win32':
|
|
|
|
raise Exception('make_bin_override should not be called on win32.')
|
2017-10-07 01:49:45 +02:00
|
|
|
# If the system python is not the python we are running (which should be
|
|
|
|
# python 2), then create a directory with a symlink called `python` to our
|
|
|
|
# sys.executable. This directory will be prefixed to the PATH, so that
|
|
|
|
# other tools that shell out to `python` will use the appropriate python
|
|
|
|
|
2017-10-16 14:33:47 +02:00
|
|
|
which_python = which('python')
|
|
|
|
if (which_python and
|
|
|
|
os.path.realpath(which_python) == os.path.realpath(sys.executable)):
|
2017-10-07 01:49:45 +02:00
|
|
|
return
|
|
|
|
|
|
|
|
bin_override = os.path.abspath('out/tools/bin')
|
|
|
|
try:
|
|
|
|
os.makedirs(bin_override)
|
|
|
|
except OSError as e:
|
|
|
|
if e.errno != errno.EEXIST: raise e
|
|
|
|
|
|
|
|
python_link = os.path.join(bin_override, 'python')
|
|
|
|
try:
|
|
|
|
os.unlink(python_link)
|
|
|
|
except OSError as e:
|
|
|
|
if e.errno != errno.ENOENT: raise e
|
|
|
|
os.symlink(sys.executable, python_link)
|
|
|
|
|
|
|
|
# We need to set the environment right now so that when gyp (in run_gyp)
|
|
|
|
# shells out, it finds the right python (specifically at
|
|
|
|
# https://github.com/nodejs/node/blob/d82e107/deps/v8/gypfiles/toolchain.gypi#L43)
|
|
|
|
os.environ['PATH'] = bin_override + ':' + os.environ['PATH']
|
|
|
|
|
|
|
|
return bin_override
|
|
|
|
|
2015-03-31 07:16:10 +02:00
|
|
|
output = {
|
2016-01-24 17:01:07 +01:00
|
|
|
'variables': {},
|
2015-03-31 07:16:10 +02:00
|
|
|
'include_dirs': [],
|
|
|
|
'libraries': [],
|
|
|
|
'defines': [],
|
|
|
|
'cflags': [],
|
|
|
|
}
|
|
|
|
|
2015-01-15 22:36:38 +01:00
|
|
|
# Print a warning when the compiler is too old.
|
2015-03-31 07:16:10 +02:00
|
|
|
check_compiler(output)
|
2015-01-15 22:36:38 +01:00
|
|
|
|
2013-05-21 18:26:42 +02:00
|
|
|
# determine the "flavor" (operating system) we're building for,
|
|
|
|
# leveraging gyp's GetFlavor function
|
2013-08-02 11:50:45 +02:00
|
|
|
flavor_params = {}
|
2013-05-21 18:26:42 +02:00
|
|
|
if (options.dest_os):
|
2013-08-02 11:50:45 +02:00
|
|
|
flavor_params['flavor'] = options.dest_os
|
|
|
|
flavor = GetFlavor(flavor_params)
|
2013-05-21 18:26:42 +02:00
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
configure_node(output)
|
2015-05-04 05:57:17 +02:00
|
|
|
configure_library('zlib', output)
|
|
|
|
configure_library('http_parser', output)
|
|
|
|
configure_library('libuv', output)
|
2016-03-17 23:25:17 +01:00
|
|
|
configure_library('libcares', output)
|
2017-11-06 09:59:01 +01:00
|
|
|
configure_library('nghttp2', output)
|
2016-03-17 23:25:17 +01:00
|
|
|
# stay backwards compatible with shared cares builds
|
|
|
|
output['variables']['node_shared_cares'] = \
|
|
|
|
output['variables'].pop('node_shared_libcares')
|
2011-11-15 04:02:44 +01:00
|
|
|
configure_v8(output)
|
|
|
|
configure_openssl(output)
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
2014-09-05 07:03:24 +02:00
|
|
|
configure_intl(output)
|
2015-12-04 09:14:24 +01:00
|
|
|
configure_static(output)
|
2016-10-06 00:11:48 +02:00
|
|
|
configure_inspector(output)
|
2013-05-08 14:10:07 +02:00
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
# variables should be a root level element,
|
|
|
|
# move everything else to target_defaults
|
|
|
|
variables = output['variables']
|
|
|
|
del output['variables']
|
2015-06-01 23:49:43 +02:00
|
|
|
|
2015-11-25 01:17:49 +01:00
|
|
|
# make_global_settings for special FIPS linking
|
|
|
|
# should not be used to compile modules in node-gyp
|
|
|
|
config_fips = { 'make_global_settings' : [] }
|
|
|
|
if 'make_fips_settings' in output:
|
|
|
|
config_fips['make_global_settings'] = output['make_fips_settings']
|
|
|
|
del output['make_fips_settings']
|
|
|
|
write('config_fips.gypi', do_not_edit +
|
|
|
|
pprint.pformat(config_fips, indent=2) + '\n')
|
|
|
|
|
2015-06-01 23:49:43 +02:00
|
|
|
# make_global_settings should be a root level element too
|
|
|
|
if 'make_global_settings' in output:
|
|
|
|
make_global_settings = output['make_global_settings']
|
|
|
|
del output['make_global_settings']
|
|
|
|
else:
|
|
|
|
make_global_settings = False
|
|
|
|
|
2011-11-15 04:02:44 +01:00
|
|
|
output = {
|
|
|
|
'variables': variables,
|
2015-06-01 23:49:43 +02:00
|
|
|
'target_defaults': output,
|
2011-11-15 04:02:44 +01:00
|
|
|
}
|
2015-06-01 23:49:43 +02:00
|
|
|
if make_global_settings:
|
|
|
|
output['make_global_settings'] = make_global_settings
|
|
|
|
|
2015-01-28 17:46:19 +01:00
|
|
|
pprint.pprint(output, indent=2)
|
2011-11-15 04:02:44 +01:00
|
|
|
|
2014-10-04 02:42:37 +02:00
|
|
|
write('config.gypi', do_not_edit +
|
2013-08-02 11:50:45 +02:00
|
|
|
pprint.pformat(output, indent=2) + '\n')
|
2012-01-17 23:02:15 +01:00
|
|
|
|
2012-09-04 16:03:01 +02:00
|
|
|
config = {
|
|
|
|
'BUILDTYPE': 'Debug' if options.debug else 'Release',
|
2012-09-14 20:16:43 +02:00
|
|
|
'USE_XCODE': str(int(options.use_xcode or 0)),
|
2012-11-20 17:28:28 +01:00
|
|
|
'PYTHON': sys.executable,
|
2017-12-05 01:07:53 +01:00
|
|
|
'NODE_TARGET_TYPE': variables['node_target_type'],
|
2012-09-04 16:03:01 +02:00
|
|
|
}
|
2013-04-24 19:15:36 +02:00
|
|
|
|
|
|
|
if options.prefix:
|
|
|
|
config['PREFIX'] = options.prefix
|
|
|
|
|
2012-09-04 16:03:01 +02:00
|
|
|
config = '\n'.join(map('='.join, config.iteritems())) + '\n'
|
|
|
|
|
2017-10-21 02:19:46 +02:00
|
|
|
# On Windows there's no reason to search for a different python binary.
|
|
|
|
bin_override = None if sys.platform == 'win32' else make_bin_override()
|
2017-10-07 01:49:45 +02:00
|
|
|
if bin_override:
|
|
|
|
config = 'export PATH:=' + bin_override + ':$(PATH)\n' + config
|
|
|
|
|
2017-04-23 18:45:46 +02:00
|
|
|
write('config.mk', do_not_edit + config)
|
2010-11-02 00:03:32 +01:00
|
|
|
|
2017-04-25 23:36:50 +02:00
|
|
|
gyp_args = ['--no-parallel']
|
2013-12-07 05:58:00 +01:00
|
|
|
|
2015-01-16 12:56:30 +01:00
|
|
|
if options.use_xcode:
|
2013-12-07 05:58:00 +01:00
|
|
|
gyp_args += ['-f', 'xcode']
|
2016-05-16 03:51:07 +02:00
|
|
|
elif options.use_ninja:
|
|
|
|
gyp_args += ['-f', 'ninja']
|
2014-08-31 00:59:05 +02:00
|
|
|
elif flavor == 'win' and sys.platform != 'msys':
|
2013-12-07 05:58:00 +01:00
|
|
|
gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']
|
2012-03-15 23:17:25 +01:00
|
|
|
else:
|
2013-12-07 05:58:00 +01:00
|
|
|
gyp_args += ['-f', 'make-' + flavor]
|
|
|
|
|
2016-08-05 13:23:22 +02:00
|
|
|
if options.compile_commands_json:
|
|
|
|
gyp_args += ['-f', 'compile_commands_json']
|
|
|
|
|
2013-12-07 05:58:00 +01:00
|
|
|
gyp_args += args
|
2012-06-28 01:07:42 +02:00
|
|
|
|
2015-01-28 17:46:19 +01:00
|
|
|
if warn.warned:
|
|
|
|
warn('warnings were emitted in the configure phase')
|
|
|
|
|
2017-04-25 23:36:50 +02:00
|
|
|
run_gyp(gyp_args)
|