Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: icu52/icu.gyp

Issue 212623010: ICU 52 : update gyp and isolate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | icu52/icu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: icu52/icu.gyp
===================================================================
--- icu52/icu.gyp (revision 259715)
+++ icu52/icu.gyp (working copy)
@@ -21,6 +21,7 @@
},
'defines': [
'U_USING_ICU_NAMESPACE=0',
+ 'HAVE_DLOPEN=0',
],
'conditions': [
['component=="static_library"', {
@@ -61,12 +62,12 @@
],
'sources': [
# These are hand-generated, but will do for now. The linux
- # version is an identical copy of the (mac) icudt46l_dat.S file,
+ # version is an identical copy of the (mac) icudt52l_dat.S file,
# modulo removal of the .private_extern and .const directives and
- # with no leading underscore on the icudt46_dat symbol.
- 'android/icudt46l_dat.S',
- 'linux/icudt46l_dat.S',
- 'mac/icudt46l_dat.S',
+ # with no leading underscore on the icudt52_dat symbol.
+ 'android/icudt52l_dat.S',
+ 'linux/icudt52l_dat.S',
+ 'mac/icudt52l_dat.S',
],
'conditions': [
[ 'use_system_icu==1 and want_separate_host_toolset==1', {
@@ -91,7 +92,7 @@
}],
[ 'icu_use_data_file_flag==1', {
# Remove any assembly data file.
- 'sources/': [['exclude', 'icudt46l_dat']],
+ 'sources/': [['exclude', 'icudt52l_dat']],
# Compile in the stub data symbol.
'sources': ['source/stubdata/stubdata.c'],
@@ -126,15 +127,15 @@
[ 'OS == "win" or OS == "mac" or OS == "ios" or '
'(OS == "android" and (_toolset != "host" or host_os != "linux")) or '
'(OS == "qnx" and (_toolset == "host" and host_os != "linux"))', {
- 'sources!': ['linux/icudt46l_dat.S'],
+ 'sources!': ['linux/icudt52l_dat.S'],
}],
[ 'OS != "android" or _toolset == "host"', {
- 'sources!': ['android/icudt46l_dat.S'],
+ 'sources!': ['android/icudt52l_dat.S'],
}],
[ 'OS != "mac" and OS != "ios" and '
'((OS != "android" and OS != "qnx") or '
'_toolset != "host" or host_os != "mac")', {
- 'sources!': ['mac/icudt46l_dat.S'],
+ 'sources!': ['mac/icudt52l_dat.S'],
}],
], # target_conditions
},
@@ -155,6 +156,22 @@
'source/i18n',
],
},
+ # Since ICU wants to internally use its own deprecated APIs, don't
+ # complain about it.
+ 'cflags': [
+ '-Wno-deprecated-declarations',
+ ],
+ 'cflags_cc': [
+ '-frtti',
+ ],
+ 'xcode_settings': {
+ 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
+ },
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'RuntimeTypeInfo': 'true',
+ },
+ },
'conditions': [
[ 'use_system_icu==1 and want_separate_host_toolset==1', {
'toolsets': ['host'],
@@ -165,28 +182,6 @@
[ 'use_system_icu==0 and want_separate_host_toolset==0', {
'toolsets': ['target'],
}],
- [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
- # Since ICU wants to internally use its own deprecated APIs, don't
- # complain about it.
- 'cflags': [
- '-Wno-deprecated-declarations',
- ],
- 'cflags_cc': [
- '-frtti',
- ],
- }],
- ['OS == "mac" or OS == "ios"', {
- 'xcode_settings': {
- 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
- },
- }],
- ['OS == "win"', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'RuntimeTypeInfo': 'true',
- },
- }
- }],
['clang==1', {
'xcode_settings': {
'WARNING_CFLAGS': [
@@ -196,10 +191,6 @@
'-Wno-logical-op-parentheses',
# ICU has some `unsigned < 0` checks.
'-Wno-tautological-compare',
- # uspoof.h has a U_NAMESPACE_USE macro. That's a bug,
- # the header should use U_NAMESPACE_BEGIN instead.
- # http://bugs.icu-project.org/trac/ticket/9054
- '-Wno-header-hygiene',
# Looks like a real issue, see http://crbug.com/114660
'-Wno-return-type-c-linkage',
],
@@ -208,7 +199,6 @@
'-Wno-deprecated-declarations',
'-Wno-logical-op-parentheses',
'-Wno-tautological-compare',
- '-Wno-header-hygiene',
'-Wno-return-type-c-linkage',
],
}],
@@ -262,6 +252,23 @@
}],
],
},
+ 'cflags': [
+ # Since ICU wants to internally use its own deprecated APIs,
+ # don't complain about it.
+ '-Wno-deprecated-declarations',
+ '-Wno-unused-function',
+ ],
+ 'cflags_cc': [
+ '-frtti',
+ ],
+ 'xcode_settings': {
+ 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
+ },
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'RuntimeTypeInfo': 'true',
+ },
+ },
'conditions': [
[ 'use_system_icu==1 and want_separate_host_toolset==1', {
'toolsets': ['host'],
@@ -277,29 +284,6 @@
'source/stubdata/stubdata.c',
],
}],
- [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
- 'cflags': [
- # Since ICU wants to internally use its own deprecated APIs,
- # don't complain about it.
- '-Wno-deprecated-declarations',
- '-Wno-unused-function',
- ],
- 'cflags_cc': [
- '-frtti',
- ],
- }],
- ['OS == "mac" or OS == "ios"', {
- 'xcode_settings': {
- 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
- },
- }],
- ['OS == "win"', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'RuntimeTypeInfo': 'true',
- },
- },
- }],
['OS == "android" and use_system_stlport == 1', {
'target_conditions': [
['_toolset == "target"', {
@@ -403,14 +387,13 @@
# find third_party/icu/source/i18n/unicode -iname '*.h' \
# -printf "'%p',\n" | \
# sed -e 's|third_party/icu/source/i18n/||' | sort -u
+ 'unicode/alphaindex.h',
'unicode/basictz.h',
- 'unicode/bmsearch.h',
- 'unicode/bms.h',
'unicode/calendar.h',
'unicode/choicfmt.h',
'unicode/coleitr.h',
- 'unicode/colldata.h',
'unicode/coll.h',
+ 'unicode/compactdecimalformat.h',
'unicode/curramt.h',
'unicode/currpinf.h',
'unicode/currunit.h',
@@ -426,6 +409,7 @@
'unicode/fmtable.h',
'unicode/format.h',
'unicode/fpositer.h',
+ 'unicode/gender.h',
'unicode/gregocal.h',
'unicode/locdspnm.h',
'unicode/measfmt.h',
@@ -439,6 +423,7 @@
'unicode/rbnf.h',
'unicode/rbtz.h',
'unicode/regex.h',
+ 'unicode/region.h',
'unicode/search.h',
'unicode/selfmt.h',
'unicode/simpletz.h',
@@ -451,6 +436,8 @@
'unicode/tmutamt.h',
'unicode/tmutfmt.h',
'unicode/translit.h',
+ 'unicode/tzfmt.h',
+ 'unicode/tznames.h',
'unicode/tzrule.h',
'unicode/tztrans.h',
'unicode/ucal.h',
@@ -458,14 +445,21 @@
'unicode/ucol.h',
'unicode/ucsdet.h',
'unicode/ucurr.h',
+ 'unicode/udateintervalformat.h',
'unicode/udat.h',
'unicode/udatpg.h',
+ 'unicode/udisplaycontext.h',
+ 'unicode/uformattable.h',
+ 'unicode/ugender.h',
'unicode/uldnames.h',
'unicode/ulocdata.h',
'unicode/umsg.h',
'unicode/unirepl.h',
'unicode/unum.h',
+ 'unicode/unumsys.h',
+ 'unicode/upluralrules.h',
'unicode/uregex.h',
+ 'unicode/uregion.h',
'unicode/usearch.h',
'unicode/uspoof.h',
'unicode/utmscale.h',
@@ -490,32 +484,32 @@
# find third_party/icu/source/common/unicode -iname '*.h' \
# -printf "'%p',\n" | \
# sed -e 's|third_party/icu/source/common/||' | sort -u
+ 'unicode/appendable.h',
'unicode/brkiter.h',
'unicode/bytestream.h',
+ 'unicode/bytestriebuilder.h',
+ 'unicode/bytestrie.h',
'unicode/caniter.h',
'unicode/chariter.h',
'unicode/dbbi.h',
'unicode/docmain.h',
'unicode/dtintrv.h',
+ 'unicode/enumset.h',
'unicode/errorcode.h',
'unicode/icudataver.h',
'unicode/icuplug.h',
'unicode/idna.h',
+ 'unicode/listformatter.h',
'unicode/localpointer.h',
'unicode/locid.h',
+ 'unicode/messagepattern.h',
'unicode/normalizer2.h',
'unicode/normlzr.h',
- 'unicode/pandroid.h',
'unicode/parseerr.h',
'unicode/parsepos.h',
- 'unicode/pfreebsd.h',
- 'unicode/plinux.h',
- 'unicode/pmac.h',
- 'unicode/popenbsd.h',
- 'unicode/ppalmos.h',
+ 'unicode/platform.h',
'unicode/ptypes.h',
'unicode/putil.h',
- 'unicode/pwin32.h',
'unicode/rbbi.h',
'unicode/rep.h',
'unicode/resbund.h',
@@ -523,12 +517,15 @@
'unicode/std_string.h',
'unicode/strenum.h',
'unicode/stringpiece.h',
+ 'unicode/stringtriebuilder.h',
'unicode/symtable.h',
'unicode/ubidi.h',
'unicode/ubrk.h',
'unicode/ucasemap.h',
'unicode/ucat.h',
'unicode/uchar.h',
+ 'unicode/ucharstriebuilder.h',
+ 'unicode/ucharstrie.h',
'unicode/uchriter.h',
'unicode/uclean.h',
'unicode/ucnv_cb.h',
@@ -537,11 +534,8 @@
'unicode/ucnvsel.h',
'unicode/uconfig.h',
'unicode/udata.h',
- 'unicode/udeprctd.h',
- 'unicode/udraft.h',
'unicode/uenum.h',
'unicode/uidna.h',
- 'unicode/uintrnal.h',
'unicode/uiter.h',
'unicode/uloc.h',
'unicode/umachine.h',
@@ -554,7 +548,6 @@
'unicode/unorm2.h',
'unicode/unorm.h',
'unicode/uobject.h',
- 'unicode/uobslete.h',
'unicode/urename.h',
'unicode/urep.h',
'unicode/ures.h',
@@ -564,7 +557,7 @@
'unicode/ushape.h',
'unicode/usprep.h',
'unicode/ustring.h',
- 'unicode/usystem.h',
+ 'unicode/ustringtrie.h',
'unicode/utext.h',
'unicode/utf16.h',
'unicode/utf32.h',
@@ -572,7 +565,6 @@
'unicode/utf.h',
'unicode/utf_old.h',
'unicode/utrace.h',
- 'unicode/utypeinfo.h',
'unicode/utypes.h',
'unicode/uvernum.h',
'unicode/uversion.h',
« no previous file with comments | « no previous file | icu52/icu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698