Skip to content

Commit 477a141

Browse files
committed
deps: Intl: ICU 57 bump
* bump to ICU 57.1 - update URL / hash * add exclusion list for 57 (sorry, missed 56). This will reduce the binary footprint on some platforms. * Exclude cstr.cpp to work around http://bugs.icu-project.org/trac/ticket/12451 on Windows/MSVC Fixes: #6058
1 parent 2d7e316 commit 477a141

2 files changed

Lines changed: 63 additions & 8 deletions

File tree

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,8 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
900900
def configure_intl(o):
901901
icus = [
902902
{
903-
'url': 'https://ssl.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip',
904-
'md5': '61d71888f14bf00cc3e8a6f2c087d367',
903+
'url': 'https://ssl.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.zip',
904+
'md5': 'f797503ecaebf1d38920013dc7893066',
905905
},
906906
]
907907
def icu_download(path):

tools/icu/icu-generic.gyp

Lines changed: 61 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,46 @@
129129
## make ZERO difference to binary size.
130130
## Made ICU-specific for future-proofing.
131131

132+
# alphabetic index
133+
'../../deps/icu/source/i18n/alphaindex.cpp',
134+
# BOCSU
135+
# misc
136+
'../../deps/icu/source/i18n/regexcmp.cpp',
137+
'../../deps/icu/source/i18n/regexcmp.h',
138+
'../../deps/icu/source/i18n/regexcst.h',
139+
'../../deps/icu/source/i18n/regeximp.cpp',
140+
'../../deps/icu/source/i18n/regeximp.h',
141+
'../../deps/icu/source/i18n/regexst.cpp',
142+
'../../deps/icu/source/i18n/regexst.h',
143+
'../../deps/icu/source/i18n/regextxt.cpp',
144+
'../../deps/icu/source/i18n/regextxt.h',
145+
'../../deps/icu/source/i18n/region.cpp',
146+
'../../deps/icu/source/i18n/region_impl.h',
147+
'../../deps/icu/source/i18n/reldatefmt.cpp',
148+
'../../deps/icu/source/i18n/reldatefmt.h'
149+
'../../deps/icu/source/i18n/scientificformathelper.cpp',
150+
'../../deps/icu/source/i18n/tmunit.cpp',
151+
'../../deps/icu/source/i18n/tmutamt.cpp',
152+
'../../deps/icu/source/i18n/tmutfmt.cpp',
153+
'../../deps/icu/source/i18n/uregex.cpp',
154+
'../../deps/icu/source/i18n/uregexc.cpp',
155+
'../../deps/icu/source/i18n/uregion.cpp',
156+
'../../deps/icu/source/i18n/uspoof.cpp',
157+
'../../deps/icu/source/i18n/uspoof_build.cpp',
158+
'../../deps/icu/source/i18n/uspoof_conf.cpp',
159+
'../../deps/icu/source/i18n/uspoof_conf.h',
160+
'../../deps/icu/source/i18n/uspoof_impl.cpp',
161+
'../../deps/icu/source/i18n/uspoof_impl.h',
162+
'../../deps/icu/source/i18n/uspoof_wsconf.cpp',
163+
'../../deps/icu/source/i18n/uspoof_wsconf.h',
164+
]}],
165+
[ 'icu_ver_major == 57', { 'sources!': [
166+
## Strip out the following for ICU 55 only.
167+
## add more conditions in the future?
168+
## if your compiler can dead-strip, this will
169+
## make ZERO difference to binary size.
170+
## Made ICU-specific for future-proofing.
171+
132172
# alphabetic index
133173
'../../deps/icu/source/i18n/alphaindex.cpp',
134174
# BOCSU
@@ -380,13 +420,10 @@
380420
'<@(icu_src_common)',
381421
],
382422
'conditions': [
423+
## if your compiler can dead-strip, these will
424+
## make ZERO difference to binary size.
425+
## Made ICU-specific for future-proofing.
383426
[ 'icu_ver_major == 55', { 'sources!': [
384-
## Strip out the following for ICU 55 only.
385-
## add more conditions in the future?
386-
## if your compiler can dead-strip, this will
387-
## make ZERO difference to binary size.
388-
## Made ICU-specific for future-proofing.
389-
390427
# bidi- not needed (yet!)
391428
'../../deps/icu/source/common/ubidi.c',
392429
'../../deps/icu/source/common/ubidiimp.h',
@@ -401,6 +438,24 @@
401438
'../../deps/icu/source/common/uts46.cpp',
402439
'../../deps/icu/source/common/uidna.cpp',
403440
]}],
441+
[ 'icu_ver_major == 57', { 'sources!': [
442+
# bidi- not needed (yet!)
443+
'../../deps/icu/source/common/ubidi.c',
444+
'../../deps/icu/source/common/ubidiimp.h',
445+
'../../deps/icu/source/common/ubidiln.c',
446+
'../../deps/icu/source/common/ubidiwrt.c',
447+
#'../../deps/icu/source/common/ubidi_props.c',
448+
#'../../deps/icu/source/common/ubidi_props.h',
449+
#'../../deps/icu/source/common/ubidi_props_data.h',
450+
# and the callers
451+
'../../deps/icu/source/common/ushape.cpp',
452+
'../../deps/icu/source/common/usprep.cpp',
453+
'../../deps/icu/source/common/uts46.cpp',
454+
'../../deps/icu/source/common/uidna.cpp',
455+
# work around http://bugs.icu-project.org/trac/ticket/12451
456+
# (benign afterwards)
457+
'../../deps/icu/source/common/cstr.cpp',
458+
]}],
404459
[ 'OS == "solaris"', { 'defines': [
405460
'_XOPEN_SOURCE_EXTENDED=0',
406461
]}],

0 commit comments

Comments
 (0)