Skip to content

Commit dc2100e

Browse files
committed
build: i18n: Autodownload ICU, Add a test.
This is to implement nodejs#7676 (comment) * make `--with-intl=none` the default * Download, verify (md5), unpack ICU's zip if not there * update docs * add a test 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 Also: * refactor some code into tools/configure.d/nodedownload.py * add `intl-none` option for `vcbuild.bat` To rebuild `deps/icu-small` - (not currently checked in) ``` bash tools/icu/prepare-icu-source.sh ``` Also: 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.
1 parent 70195ac commit dc2100e

10 files changed

+396
-19
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ ipch/
4646
email.md
4747
deps/v8-*
4848
deps/icu
49+
deps/icu*.zip
50+
deps/icu*.tgz
4951
./node_modules
5052
.svn/
5153

README.md

+60-4
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,76 @@ make doc
8383
man doc/node.1
8484
```
8585

86-
### To build `Intl` (ECMA-402) support:
86+
### `Intl` (ECMA-402) support:
8787

88-
*Note:* more docs, including how to reduce disk footprint, are on
88+
[Intl](https://github.com/joyent/node/wiki/Intl) support is not
89+
enabled by default.
90+
91+
#### "small" (English only) support
92+
93+
This option will build with "small" (English only) support, but
94+
the full `Intl` (ECMA-402) APIs. It will download the ICU library
95+
as needed.
96+
97+
Unix/Macintosh:
98+
99+
```sh
100+
./configure --with-intl=small-icu
101+
```
102+
103+
Windows:
104+
105+
```sh
106+
vcbuild small-icu
107+
```
108+
109+
The `small-icu` mode builds
110+
with English-only data. You can add full data at runtime.
111+
112+
*Note:* more docs are on
89113
[the wiki](https://github.com/joyent/node/wiki/Intl).
90114

115+
#### Build with full ICU support (all locales supported by ICU):
116+
117+
*Note*, this may download ICU if you don't have an ICU in `deps/icu`
118+
119+
Unix/Macintosh:
120+
121+
```sh
122+
./configure --with-intl=full-icu
123+
```
124+
125+
Windows:
126+
127+
```sh
128+
vcbuild full-icu
129+
```
130+
131+
#### Build with no Intl support `:-(`
132+
133+
The `Intl` object will not be available.
134+
135+
Unix/Macintosh:
136+
137+
```sh
138+
./configure --with-intl=none
139+
```
140+
141+
Windows:
142+
143+
```sh
144+
vcbuild intl-none
145+
```
146+
91147
#### Use existing installed ICU (Unix/Macintosh only):
92148

93149
```sh
94150
pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
95151
```
96152

97-
#### Build ICU from source:
153+
#### Build with a specific ICU:
98154

99-
First: Unpack latest ICU
155+
First: Unpack latest ICU to `deps/icu`
100156
[icu4c-**##.#**-src.tgz](http://icu-project.org/download) (or `.zip`)
101157
as `deps/icu` (You'll have: `deps/icu/source/...`)
102158

configure

+93-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ import re
66
import shlex
77
import subprocess
88
import sys
9+
import urllib
10+
import zipfile
11+
import hashlib
12+
import shutil
913

1014
CC = os.environ.get('CC', 'cc')
1115

1216
root_dir = os.path.dirname(__file__)
1317
sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))
1418
from gyp.common import GetFlavor
1519

20+
# imports in tools/configure.d
21+
sys.path.insert(0, os.path.join(root_dir, 'tools', 'configure.d'))
22+
import nodedownload
23+
1624
# parse our options
1725
parser = optparse.OptionParser()
1826

@@ -712,6 +720,56 @@ def glob_to_var(dir_base, dir_sub):
712720
return list
713721

714722
def configure_intl(o):
723+
icus = [
724+
{
725+
'url': 'http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.zip',
726+
# from https://ssl.icu-project.org/files/icu4c/54.1/icu4c-src-54_1.md5:
727+
'md5': '6b89d60e2f0e140898ae4d7f72323bca',
728+
},
729+
]
730+
class ConfigOpener(urllib.FancyURLopener):
731+
# append to existing version (UA)
732+
version = '%s (node.js/configure)' % urllib.URLopener.version
733+
def icu_download(path):
734+
# download ICU, if needed
735+
def reporthook(count, size, total):
736+
sys.stdout.write(' ICU: %c %sMB total, %sMB downloaded \r' %
737+
(nodedownload.spin(count),
738+
nodedownload.formatSize(total),
739+
nodedownload.formatSize(count*size)))
740+
for icu in icus:
741+
url = icu['url']
742+
md5 = icu['md5']
743+
local = url.split('/')[-1]
744+
targetfile = os.path.join(root_dir, 'deps', local)
745+
if not os.path.isfile(targetfile):
746+
try:
747+
sys.stdout.write(' <%s>\nConnecting...\r' % url)
748+
sys.stdout.flush()
749+
msg = urllib.urlretrieve(url, targetfile, reporthook=reporthook)
750+
print '' # clear the line
751+
except:
752+
print ' ** Error occurred while downloading\n <%s>' % url
753+
raise
754+
else:
755+
print ' Re-using existing %s' % targetfile
756+
if os.path.isfile(targetfile):
757+
digest = hashlib.md5()
758+
count = 0
759+
sys.stdout.write(' Checking file integrity with MD5:\r')
760+
with open(targetfile, 'rb') as f:
761+
chunk = f.read(1024)
762+
while chunk != "":
763+
digest.update(chunk)
764+
chunk = f.read(1024)
765+
gotmd5 = digest.hexdigest()
766+
print ' MD5: %s %s' % (gotmd5, targetfile)
767+
if (md5 == gotmd5):
768+
return targetfile
769+
else:
770+
print ' Expected: %s *MISMATCH*' % md5
771+
print '\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile
772+
return None
715773
icu_config = {
716774
'variables': {}
717775
}
@@ -723,7 +781,6 @@ def configure_intl(o):
723781
write(icu_config_name, do_not_edit +
724782
pprint.pformat(icu_config, indent=2) + '\n')
725783

726-
# small ICU is off by default.
727784
# always set icu_small, node.gyp depends on it being defined.
728785
o['variables']['icu_small'] = b(False)
729786

@@ -739,6 +796,8 @@ def configure_intl(o):
739796
o['variables']['icu_gyp_path'] = options.with_icu_path
740797
return
741798
# --with-intl=<with_intl>
799+
if with_intl is None:
800+
with_intl = 'none' # The default mode of Intl
742801
if with_intl == 'none' or with_intl is None:
743802
o['variables']['v8_enable_i18n_support'] = 0
744803
return # no Intl
@@ -769,20 +828,47 @@ def configure_intl(o):
769828
# Note: non-ICU implementations could use other 'with_intl'
770829
# values.
771830

831+
icu_parent_path = os.path.join(root_dir, 'deps')
832+
icu_full_path = os.path.join(icu_parent_path, 'icu')
833+
icu_small_path = os.path.join(icu_parent_path, 'icu-small')
834+
icu_small_tag = os.path.join(icu_full_path, 'is-small-icu.txt')
835+
836+
## Use (or not) an embedded small-icu.
837+
if with_intl == 'small-icu':
838+
if not os.path.isdir(icu_full_path) and os.path.isdir(icu_small_path):
839+
# deps/small-icu -> deps/icu
840+
print 'Copying small ICU %s to %s' % (icu_small_path, icu_full_path)
841+
shutil.copytree(icu_small_path, icu_full_path)
842+
#else:
843+
# print 'Not copying %s to %s' % (icu_small_path, icu_full_path)
844+
elif os.path.isfile(icu_small_tag):
845+
print 'deleting small-icu %s for --with-intl=%s' % (icu_full_path, with_intl)
846+
shutil.rmtree(icu_full_path)
847+
772848
# ICU mode. (icu-generic.gyp)
773849
byteorder = sys.byteorder
774850
o['variables']['icu_gyp_path'] = 'tools/icu/icu-generic.gyp'
775851
# ICU source dir relative to root
776-
icu_full_path = os.path.join(root_dir, 'deps/icu')
777852
o['variables']['icu_path'] = icu_full_path
778853
if not os.path.isdir(icu_full_path):
779-
print 'Error: ICU path is not a directory: %s' % (icu_full_path)
854+
print '* ECMA-402 (Intl) support didn\'t find ICU in %s..' % (icu_full_path)
855+
# can we download (or find) a zipfile?
856+
localzip = icu_download(icu_full_path)
857+
if localzip:
858+
with zipfile.ZipFile(localzip, 'r') as icuzip:
859+
print ' Extracting ICU source zip: %s' % localzip
860+
icuzip.extractall(icu_parent_path)
861+
if not os.path.isdir(icu_full_path):
862+
print ' Cannot build Intl without ICU in %s.' % (icu_full_path)
863+
print ' (Fix, or disable with "--with-intl=none" )'
780864
sys.exit(1)
865+
else:
866+
print '* Using ICU in %s' % (icu_full_path)
781867
# Now, what version of ICU is it? We just need the "major", such as 54.
782868
# uvernum.h contains it as a #define.
783869
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
784870
if not os.path.isfile(uvernum_h):
785-
print 'Error: could not load %s - is ICU installed?' % uvernum_h
871+
print ' Error: could not load %s - is ICU installed?' % uvernum_h
786872
sys.exit(1)
787873
icu_ver_major = None
788874
matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*'
@@ -792,7 +878,7 @@ def configure_intl(o):
792878
if m:
793879
icu_ver_major = m.group(1)
794880
if not icu_ver_major:
795-
print 'Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h
881+
print ' Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h
796882
sys.exit(1)
797883
icu_endianness = sys.byteorder[0]; # TODO(srl295): EBCDIC should be 'e'
798884
o['variables']['icu_ver_major'] = icu_ver_major
@@ -819,8 +905,8 @@ def configure_intl(o):
819905
# this is the icudt*.dat file which node will be using (platform endianness)
820906
o['variables']['icu_data_file'] = icu_data_file
821907
if not os.path.isfile(icu_data_path):
822-
print 'Error: ICU prebuilt data file %s does not exist.' % icu_data_path
823-
print 'See the README.md.'
908+
print ' Error: ICU prebuilt data file %s does not exist.' % icu_data_path
909+
print ' See the README.md.'
824910
# .. and we're not about to build it from .gyp!
825911
sys.exit(1)
826912
# map from variable name to subdirs

test/simple/test-intl.js

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
25+
var enablei18n = process.config.variables.v8_enable_i18n_support;
26+
if (enablei18n === undefined) {
27+
enablei18n = false;
28+
}
29+
30+
var haveIntl = ( global.Intl != undefined );
31+
32+
if (!haveIntl) {
33+
assert.equal(enablei18n, false, '"Intl" object is NOT present but v8_enable_i18n_support is ' + enablei18n);
34+
console.log('Skipping Intl tests because Intl object not present.');
35+
} else {
36+
assert.equal(enablei18n, true, '"Intl" object is present but v8_enable_i18n_support is ' + enablei18n + '. Is this test out of date?');
37+
38+
// Check with toLocaleString
39+
var date0 = new Date(0);
40+
var GMT = 'Etc/GMT';
41+
var optsGMT = {timeZone: GMT};
42+
var localeString0 = date0.toLocaleString(['en'], optsGMT);
43+
var expectString0 = '1/1/1970, 12:00:00 AM'; // epoch
44+
assert.equal(localeString0, expectString0);
45+
46+
// check with a Formatter
47+
var dtf = new Intl.DateTimeFormat(['en'], {timeZone: GMT, month: 'short', year: '2-digit'});
48+
var localeString1 = dtf.format(date0);
49+
assert.equal(localeString1, 'Jan 70');
50+
51+
// number format
52+
assert.equal(new Intl.NumberFormat(['en']).format(12345.67890), '12,345.679');
53+
54+
var coll = new Intl.Collator(['en'],{sensitivity:'base',ignorePunctuation:true});
55+
56+
assert.equal(coll.compare('blackbird', 'black-bird'), 0, 'ignore punctuation failed');
57+
58+
assert.equal(coll.compare('blackbird', 'red-bird'), -1, 'compare less failed');
59+
assert.equal(coll.compare('bluebird', 'blackbird'), 1, 'compare greater failed');
60+
assert.equal(coll.compare('Bluebird', 'bluebird'), 0, 'ignore case failed');
61+
assert.equal(coll.compare('\ufb03', 'ffi'), 0, 'ffi ligature (contraction) failed');
62+
}

tools/configure.d/nodedownload.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Moved some utilities here from ../../configure
2+
3+
def formatSize(amt):
4+
"""Format a size as a string"""
5+
return "{:.1f}".format(amt / 1024000.)
6+
7+
def spin(c):
8+
"""print out a spinner based on 'c'"""
9+
# spin = "\\|/-"
10+
spin = ".:|'"
11+
return (spin[c % len(spin)])

0 commit comments

Comments
 (0)