ICU 52 : update gyp and isolate

icu52/icu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     'icu.gypi',
   ],
   'variables': {
     'use_system_icu%': 0,
@@ skipping 43 matching lines @@
     ['use_system_icu==0 or want_separate_host_toolset==1', {
       'targets': [
         {
           'target_name': 'icudata',
           'type': 'static_library',
           'defines': [
             'U_HIDE_DATA_SYMBOL',
           ],
           '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', {
               'toolsets': ['host'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==0', {
               'toolsets': ['target'],
             }],
             [ 'OS == "win" and icu_use_data_file_flag==0', {
               'type': 'none',
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     'windows/icudt.dll',
                   ],
                 },
               ],
             }],
             [ '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'],
              
               # Make sure any binary depending on this gets the data file.
               'conditions': [
                 ['OS != "ios"', {
                   'copies': [{
                     'destination': '<(PRODUCT_DIR)',
                     'conditions': [
                       ['OS == "android"', {
@@ skipping 14 matching lines @@
                     ],
                   },
                 }], # OS!=ios
               ], # conditions
             }], # icu_use_data_file_flag 
           ], # conditions
           'target_conditions': [
             [ '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
         },
         {
           'target_name': 'icui18n',
           'type': '<(component)',
           'sources': [
             '<@(icui18n_sources)',
           ],
           'defines': [
             'U_I18N_IMPLEMENTATION',
           ],
           'dependencies': [
             'icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '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'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
             [ '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': [
                   # ICU uses its own deprecated functions.
                   '-Wno-deprecated-declarations',
                   # ICU prefers `a && b || c` over `(a && b) || c`.
                   '-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',
                 ],
               },
               'cflags': [
                 '-Wno-deprecated-declarations',
                 '-Wno-logical-op-parentheses',
                 '-Wno-tautological-compare',
-                '-Wno-header-hygiene',
                 '-Wno-return-type-c-linkage',
               ],
             }],
             ['OS == "android" and clang==0', {
                 # Disable sincos() optimization to avoid a linker error since
                 # Android's math library doesn't have sincos().  Either
                 # -fno-builtin-sin or -fno-builtin-cos works.
                 'cflags': [
                     '-fno-builtin-sin',
                 ],
@@ skipping 33 matching lines @@
               'source/common',
             ],
             'conditions': [
               [ 'component=="static_library"', {
                 'defines': [
                   'U_STATIC_IMPLEMENTATION',
                 ],
               }],
             ],
           },
+          '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'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==0', {
               'toolsets': ['target'],
             }],
             [ 'OS == "win"', {
               'sources': [
                 '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',
-                },
+              'link_settings': {
+                # v8 mksnapshot needs dlopen and friends.

[Nico, 2014/04/01 17:59:51]

This is needed because icu/source/common/putil.c calls dlopen, not becuse
mksnapshot needs it, right? (In the latter case, mksnapshot's project should
have this setting instead.)

(Building icu without HAVE_DLOPEN defined would probably remove icu's calls to
dlopen; I don't know if that would remove important functionality though.)

+                'libraries': [
+                  '-ldl',
+                ],
               },
             }],
             ['OS == "android" and use_system_stlport == 1', {
               'target_conditions': [
                 ['_toolset == "target"', {
                   # ICU requires RTTI, which is not present in the system's
                   # stlport, so we have to include gabi++.
                   'include_dirs': [
                     '<(android_src)/abi/cpp/include',
                   ],
@@ skipping 85 matching lines @@
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
             'headers_root_path': 'source/i18n',
             'header_filenames': [
               # This list can easily be updated using the command below:
               # 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',
               'unicode/datefmt.h',
               'unicode/dcfmtsym.h',
               'unicode/decimfmt.h',
               'unicode/dtfmtsym.h',
               'unicode/dtitvfmt.h',
               'unicode/dtitvinf.h',
               'unicode/dtptngen.h',
               'unicode/dtrule.h',
               'unicode/fieldpos.h',
               'unicode/fmtable.h',
               'unicode/format.h',
               'unicode/fpositer.h',
+              'unicode/gender.h',
               'unicode/gregocal.h',
               'unicode/locdspnm.h',
               'unicode/measfmt.h',
               'unicode/measunit.h',
               'unicode/measure.h',
               'unicode/msgfmt.h',
               'unicode/numfmt.h',
               'unicode/numsys.h',
               'unicode/plurfmt.h',
               'unicode/plurrule.h',
               'unicode/rbnf.h',
               'unicode/rbtz.h',
               'unicode/regex.h',
+              'unicode/region.h',
               'unicode/search.h',
               'unicode/selfmt.h',
               'unicode/simpletz.h',
               'unicode/smpdtfmt.h',
               'unicode/sortkey.h',
               'unicode/stsearch.h',
               'unicode/tblcoll.h',
               'unicode/timezone.h',
               'unicode/tmunit.h',
               'unicode/tmutamt.h',
               'unicode/tmutfmt.h',
               'unicode/translit.h',
+              'unicode/tzfmt.h',
+              'unicode/tznames.h',
               'unicode/tzrule.h',
               'unicode/tztrans.h',
               'unicode/ucal.h',
               'unicode/ucoleitr.h',
               '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',
               'unicode/utrans.h',
               'unicode/vtzone.h',
             ],
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
         {
           'target_name': 'icuuc',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
             'headers_root_path': 'source/common',
             'header_filenames': [
               # This list can easily be updated using the command below:
               # 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',
               'unicode/schriter.h',
               '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',
               'unicode/ucnv_err.h',
               'unicode/ucnv.h',
               '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',
               'unicode/umisc.h',
               'unicode/unifilt.h',
               'unicode/unifunct.h',
               'unicode/unimatch.h',
               'unicode/uniset.h',
               'unicode/unistr.h',
               'unicode/unorm2.h',
               'unicode/unorm.h',
               'unicode/uobject.h',
-              'unicode/uobslete.h',
               'unicode/urename.h',
               'unicode/urep.h',
               'unicode/ures.h',
               'unicode/uscript.h',
               'unicode/uset.h',
               'unicode/usetiter.h',
               'unicode/ushape.h',
               'unicode/usprep.h',
               'unicode/ustring.h',
-              'unicode/usystem.h',
+              'unicode/ustringtrie.h',
               'unicode/utext.h',
               'unicode/utf16.h',
               'unicode/utf32.h',
               'unicode/utf8.h',
               'unicode/utf.h',
               'unicode/utf_old.h',
               'unicode/utrace.h',
-              'unicode/utypeinfo.h',
               'unicode/utypes.h',
               'unicode/uvernum.h',
               'unicode/uversion.h',
             ],
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }