Compile ICU for [P]NaCl

icu_untrusted.gyp

Index: icu_untrusted.gyp
diff --git a/icu_untrusted.gyp b/icu_untrusted.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..240943bb68b428b73421d8f6118422416ad11b7b
--- /dev/null
+++ b/icu_untrusted.gyp
@@ -0,0 +1,124 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.

[Mark Mentovai, 2013/12/19 18:26:47]

icu doesn’t really know anything special about NaCl, so the word “untrusted”
won’t necessarily make any sense to someone looking here. This should be named
icu_nacl_untrusted.gyp.

[Sergey Ulanov, 2013/12/20 00:55:21]

untrusted is the suffix used for all other NaCl targets (e.g. base_untrusted). I
agree that calling them base_nacl and ice_nacl would be better, but
ice_untrusted is more consistent with what we already have.

+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'werror': '',

[Mark Mentovai, 2013/12/19 18:26:47]

Why?

[Sergey Ulanov, 2013/12/20 00:55:21]

Removed.

+  },
+  'includes': [
+    'icu.gypi',
+    '../../native_client/build/untrusted.gypi',
+  ],
+  'target_defaults': {
+    'direct_dependent_settings': {
+      'defines': [
+        # Tell ICU to not insert |using namespace icu;| into its headers,
+        # so that chrome's source explicitly has to use |icu::|.
+        'U_USING_ICU_NAMESPACE=0',
+      ],
+    },
+    'defines': [
+      'U_USING_ICU_NAMESPACE=0',
+      'U_STATIC_IMPLEMENTATION',
+    ],
+    'include_dirs': [
+      'source/common',
+      'source/i18n',
+    ],
+    'compile_flags': [
+      '-w',

[Mark Mentovai, 2013/12/19 18:26:47]

Why?

[Sergey Ulanov, 2013/12/20 00:55:21]

Replaced with suppressions for specific warnings that we get in ICU. 

+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'icudata_untrusted',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libicudata_untrusted.a',
+        'build_glibc': 1,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+        'data_c_file':
+            '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/nacl/iucdt46l.c',

[Mark Mentovai, 2013/12/19 18:26:47]

This file is only dealt with from one target. It can be in INTERMEDIATE_DIR. It
doesn’t need to be in SHARED_INTERMEDIATE_DIR.

[Sergey Ulanov, 2013/12/20 00:55:21]

Remove this line.

+        'extra_deps': [ '<(data_c_file)' ],
+        'extra_args': [ '<(data_c_file)' ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',

[Mark Mentovai, 2013/12/19 18:26:47]

You know where native_client is relative to icu in the source tree. Give the
right number of dots. <(DEPTH) is deprecated and should only be used in
instances where you can’t say what you mean to say with dots.

[Sergey Ulanov, 2013/12/20 00:55:21]

Done.

+      ],
+      'defines': [
+        'U_HIDE_DATA_SYMBOL',
+      ],
+      'actions': [
+        {
+          'action_name': 'Convert icudata to C',
+          'inputs': [
+            'icu_data_to_c.py',
+            'source/data/in/icudt46l.dat'

[jungshik at Google, 2013/12/19 06:25:05]

This was renamed to icudtl.dat to make it version-agnostic. No need to change
the filename when ICU is updated. 

[Sergey Ulanov, 2013/12/20 00:55:21]

Done.

+          ],
+          'outputs': [
+            '<(data_c_file)'
+          ],
+          'action': [
+            'python', 'icu_data_to_c.py',

[Mark Mentovai, 2013/12/19 18:26:47]

Don’t write the same names more than once when you can avoid it: this can be
['python', '<@(_inputs)', '<@(_outputs)']

[Sergey Ulanov, 2013/12/20 00:55:21]

Done.

+            'source/data/in/icudt46l.dat', '<(data_c_file)',

[jungshik at Google, 2013/12/19 06:25:05]

ditto

[Sergey Ulanov, 2013/12/20 00:55:21]

Done.

+          ],
+        },
+      ],  # actions
+    },
+    {
+      'target_name': 'icui18n_untrusted',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libicui18n_untrusted.a',
+        'build_glibc': 1,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+      },
+      'sources': [
+        '<@(icui18n_sources)',
+      ],
+      'defines': [
+        'U_I18N_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',

[Mark Mentovai, 2013/12/19 18:26:47]

As on line 47. And the same on line 111.

[Sergey Ulanov, 2013/12/20 00:55:21]

Done.

+        'icuuc_untrusted',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'source/i18n',
+        ],
+      },
+    },
+    {
+      'target_name': 'icuuc_untrusted',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libicuuc_untrusted.a',
+        'build_glibc': 1,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+      },
+      'sources': [
+        '<@(icuuc_sources)',
+      ],
+      'defines': [
+        'U_COMMON_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        'icudata_untrusted',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'source/common',
+        ],
+        'defines': [
+          'U_STATIC_IMPLEMENTATION',
+        ],
+      },
+    },
+  ],
+}