Skip to content

Commit

Permalink
deps: Intl: ICU 57 bump
Browse files Browse the repository at this point in the history
* 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: nodejs#6058
  • Loading branch information
srl295 committed Apr 5, 2016
1 parent 2d7e316 commit 477a141
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 8 deletions.
4 changes: 2 additions & 2 deletions configure
Expand Up @@ -900,8 +900,8 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
def configure_intl(o):
icus = [
{
'url': 'https://ssl.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip',
'md5': '61d71888f14bf00cc3e8a6f2c087d367',
'url': 'https://ssl.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.zip',
'md5': 'f797503ecaebf1d38920013dc7893066',
},
]
def icu_download(path):
Expand Down
67 changes: 61 additions & 6 deletions tools/icu/icu-generic.gyp
Expand Up @@ -129,6 +129,46 @@
## make ZERO difference to binary size.
## Made ICU-specific for future-proofing.

# alphabetic index
'../../deps/icu/source/i18n/alphaindex.cpp',
# BOCSU
# misc
'../../deps/icu/source/i18n/regexcmp.cpp',
'../../deps/icu/source/i18n/regexcmp.h',
'../../deps/icu/source/i18n/regexcst.h',
'../../deps/icu/source/i18n/regeximp.cpp',
'../../deps/icu/source/i18n/regeximp.h',
'../../deps/icu/source/i18n/regexst.cpp',
'../../deps/icu/source/i18n/regexst.h',
'../../deps/icu/source/i18n/regextxt.cpp',
'../../deps/icu/source/i18n/regextxt.h',
'../../deps/icu/source/i18n/region.cpp',
'../../deps/icu/source/i18n/region_impl.h',
'../../deps/icu/source/i18n/reldatefmt.cpp',
'../../deps/icu/source/i18n/reldatefmt.h'
'../../deps/icu/source/i18n/scientificformathelper.cpp',
'../../deps/icu/source/i18n/tmunit.cpp',
'../../deps/icu/source/i18n/tmutamt.cpp',
'../../deps/icu/source/i18n/tmutfmt.cpp',
'../../deps/icu/source/i18n/uregex.cpp',
'../../deps/icu/source/i18n/uregexc.cpp',
'../../deps/icu/source/i18n/uregion.cpp',
'../../deps/icu/source/i18n/uspoof.cpp',
'../../deps/icu/source/i18n/uspoof_build.cpp',
'../../deps/icu/source/i18n/uspoof_conf.cpp',
'../../deps/icu/source/i18n/uspoof_conf.h',
'../../deps/icu/source/i18n/uspoof_impl.cpp',
'../../deps/icu/source/i18n/uspoof_impl.h',
'../../deps/icu/source/i18n/uspoof_wsconf.cpp',
'../../deps/icu/source/i18n/uspoof_wsconf.h',
]}],
[ 'icu_ver_major == 57', { 'sources!': [
## Strip out the following for ICU 55 only.
## add more conditions in the future?
## if your compiler can dead-strip, this will
## make ZERO difference to binary size.
## Made ICU-specific for future-proofing.

# alphabetic index
'../../deps/icu/source/i18n/alphaindex.cpp',
# BOCSU
Expand Down Expand Up @@ -380,13 +420,10 @@
'<@(icu_src_common)',
],
'conditions': [
## if your compiler can dead-strip, these will
## make ZERO difference to binary size.
## Made ICU-specific for future-proofing.
[ 'icu_ver_major == 55', { 'sources!': [
## Strip out the following for ICU 55 only.
## add more conditions in the future?
## if your compiler can dead-strip, this will
## make ZERO difference to binary size.
## Made ICU-specific for future-proofing.

# bidi- not needed (yet!)
'../../deps/icu/source/common/ubidi.c',
'../../deps/icu/source/common/ubidiimp.h',
Expand All @@ -401,6 +438,24 @@
'../../deps/icu/source/common/uts46.cpp',
'../../deps/icu/source/common/uidna.cpp',
]}],
[ 'icu_ver_major == 57', { 'sources!': [
# bidi- not needed (yet!)
'../../deps/icu/source/common/ubidi.c',
'../../deps/icu/source/common/ubidiimp.h',
'../../deps/icu/source/common/ubidiln.c',
'../../deps/icu/source/common/ubidiwrt.c',
#'../../deps/icu/source/common/ubidi_props.c',
#'../../deps/icu/source/common/ubidi_props.h',
#'../../deps/icu/source/common/ubidi_props_data.h',
# and the callers
'../../deps/icu/source/common/ushape.cpp',
'../../deps/icu/source/common/usprep.cpp',
'../../deps/icu/source/common/uts46.cpp',
'../../deps/icu/source/common/uidna.cpp',
# work around http://bugs.icu-project.org/trac/ticket/12451
# (benign afterwards)
'../../deps/icu/source/common/cstr.cpp',
]}],
[ 'OS == "solaris"', { 'defines': [
'_XOPEN_SOURCE_EXTENDED=0',
]}],
Expand Down

0 comments on commit 477a141

Please sign in to comment.