Autofill phone number enhancements and integration of Phone Number Util Library: part 1

third_party/libphonenumber/libphonenumber.gyp

Index: third_party/libphonenumber/libphonenumber.gyp
===================================================================
--- third_party/libphonenumber/libphonenumber.gyp	(revision 0)
+++ third_party/libphonenumber/libphonenumber.gyp	(revision 0)
@@ -0,0 +1,172 @@
+# Copyright (c) 2011 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.
+
+{

[dhollowa, 2011/04/25 20:09:20]

I'm having trouble building release build on Mac.

[GeorgeY, 2011/04/27 00:41:45]

Let's investigate tomorrow...

+  'variables': {
+    'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
+  },
+  'target_defaults': {
+    'include_dirs': [
+      '../..', # add it first, so scrc/base headers are used
+               # instead of the ones brought with the library
+               # as cc files would be taken from the main
+               # chrome tree as well.
+      './cpp/src',
+      '<(protoc_out_dir)/cpp/src',

[dhollowa, 2011/04/27 16:11:57]

phonenumberutil.h:32 has: #include "src/cpp/phonenumber.pb.h"

but

phonenumberutil.cc has: #include "phonemetadata.pb.h"

So this is not resolving correctly.

[GeorgeY, 2011/04/28 07:21:18]

Not anymore! :) Fixed.

+      '../protobuf/src',
+      '../icu/public/common',
+      '../icu/public/i18n',
+    ],
+   'defines': [
+      'U_USING_ICU_NAMESPACE=0',
+    ],
+   'conditions': [
+      ['OS!="win" or component=="static_library"', {
+        'defines': [
+          'U_STATIC_IMPLEMENTATION',
+        ],
+      }],
+    ],
+  },
+  'targets': [
+  {
+    'target_name': 'libphonenumber',
+    'type': '<(library)',
+    'dependencies': [
+        'phonenumber_proto',
+    ],
+    'sources': [
+	    'chrome/regexp_adapter_icuregexp.cc',
+	    'cpp/src/default_logger.cc',
+	    'cpp/src/logger_adapter.cc',
+	    'cpp/src/metadata.cc',         # Generated by src/embed_binary_data.sh

[dhollowa, 2011/04/26 17:26:14]

This "generated" comment is at end of line, whereas the similar comment at line
49 is above.  Let's put both above, so they match.

[GeorgeY, 2011/04/27 00:41:45]

Done.

+	    'cpp/src/phonenumberutil.cc',
+	    'cpp/src/stringutil.cc',
+	    'cpp/src/utf/rune.c',
+	    'cpp/src/utf/unicodetext.cc',
+	    'cpp/src/utf/unilib.cc',
+            # generated by phonenumber_proto

[dhollowa, 2011/04/26 17:26:14]

s/generated/Generated/
and end sentence with a period.

[GeorgeY, 2011/04/27 00:41:45]

Done.

+            '<(protoc_out_dir)/cpp/src/phonemetadata.pb.cc',
+            '<(protoc_out_dir)/cpp/src/phonenumber.pb.cc',
+    ],
+    'conditions': [
+      ['OS=="win"', {
+        'defines': [
+          'COMPILER_MSVC=1',
+          'OS_WIN=1',
+          'ARCH_CPU_X86_FAMILY=1',
+        ],
+        'action': [
+          '/wo4309',
+        ],
+      },],
+      ['OS=="linux"', {
+        'defines': [
+          'COMPILER_GCC=1',
+          'OS_POSIX=1',
+          'OS_LINUX=1',
+        ],
+      },],
+      ['OS=="mac"', {
+        'defines': [
+          'OS_MAC=1',
+        ],
+      }],  # OS=="mac"
+    ],
+  },
+  {
+    # Protobuf compiler / generate rule for the phones
+    'target_name': 'phonenumber_proto',
+    'type': 'none',
+    'sources': [
+       'cpp/src/phonemetadata.proto',
+       'cpp/src/phonenumber.proto',
+    ],
+    'rules': [
+      {
+        'rule_name': 'genproto',
+        'extension': 'proto',
+        'inputs': [
+          '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+        ],
+        'variables': {
+          # The protoc compiler requires a proto_path argument with the
+          # directory containing the .proto file.
+          # There's no generator variable that corresponds to this, so fake it.
+          'rule_input_relpath': 'cpp/src',
+        },
+        'outputs': [
+          '<(protoc_out_dir)/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.h',
+          '<(protoc_out_dir)/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
+        ],
+        'action': [
+          '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+          '--proto_path=./<(rule_input_relpath)',
+          './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+          '--cpp_out=<(protoc_out_dir)/<(rule_input_relpath)',
+        ],
+        'message': 'Generating C++ code from <(RULE_INPUT_PATH)',
+      },
+    ],
+    'dependencies': [
+      '../protobuf/protobuf.gyp:protobuf_lite',
+      '../protobuf/protobuf.gyp:protoc#host',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+          '<(protoc_out_dir)',
+      ]
+    },
+    'export_dependent_settings': [
+      '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+    ],
+  },
+  {
+    'target_name': 'libphonenumber_unittests',
+    'type': 'executable',
+    'sources': [
+      '../../base/test/run_all_unittests.cc',
+      'cpp/src/phonenumberutil_test.cc',
+      'cpp/src/regexp_adapter_unittest.cc',
+      'cpp/src/stringutil_test.cc',
+      'cpp/src/test_metadata.cc',
+    ],
+    'dependencies': [
+      '../icu/icu.gyp:icui18n',
+      '../icu/icu.gyp:icuuc',
+      '../protobuf/protobuf.gyp:protobuf_lite',
+      #'../protobuf/protobuf.gyp:protoc#host',

[dhollowa, 2011/04/26 17:26:14]

Remove this if not needed.

[GeorgeY, 2011/04/27 00:41:45]

Done.

+      '../../base/base.gyp:base',
+      '../../base/base.gyp:test_support_base',
+      '../../testing/gmock.gyp:gmock',
+      '../../testing/gtest.gyp:gtest',
+      'libphonenumber',
+    ],
+    'conditions': [
+      ['OS=="win"', {
+        'defines': [
+          'COMPILER_MSVC=1',
+          'OS_WIN=1',
+          'ARCH_CPU_X86_FAMILY=1',
+        ],
+        'action': [
+          '/wo4309',
+        ],
+      },],
+      ['OS=="linux"', {
+        'defines': [
+          'COMPILER_GCC=1',
+          'OS_POSIX=1',
+          'OS_LINUX=1',
+        ],
+      },],
+      ['OS=="mac"', {
+        'defines': [
+          'OS_MAC=1',
+        ],
+      }],  # OS=="mac"
+    ],
+  },
+  ]
+}
Property changes on: third_party\libphonenumber\libphonenumber.gyp
___________________________________________________________________
Added: svn:eol-style
   + LF