Add ui/base/ime/ime.gypi.

BUG=chromium-os:24780
TEST=ran try bots by     $ for i in linux_chromeos_aura win_aura linux_chromeos linux win linux_shared win_shared cros_aura cros_x86 ; do git try -b $i -c ; done
TEST=built ui, ui_unittests, and chrome locally from scratch on Goobuntu with and without chromeos=1/aura=1 by     $ for i in 0 1 ; do for j in 0 1 ; do export GYP_DEFINES="chromeos=$i use_aura=$j" ; ( gclient runhooks && rm -rf out/ && make ui && rm -rf out/ && make ui_unittests && out/Debug/ui_unittests --gtest_filter='*IBus*' && out/Debug/ui_unittests --gtest_filter='*Compose*' && rm -rf out/ && make chrome ) || break 2; done ; done


Review URL: http://codereview.chromium.org/9155004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117392 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 99 insertions, 65 deletions

diff --git a/ui/base/ime/ime.gypi b/ui/base/ime/ime.gypi
new file mode 100644
index 0000000..55b830f
--- /dev/null
+++ b/ui/base/ime/ime.gypi
@@ -0,0 +1,75 @@
+# 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.
+
+{
+  'variables': {
+    'ime_files': [
+      'character_composer.cc',
+      'character_composer.h',
+      'composition_text.cc',
+      'composition_text.h',
+      'composition_underline.h',
+      'ibus_client.h',
+      'ibus_client_impl.cc',
+      'ibus_client_impl.h',
+      'input_method.h',
+      'input_method_base.cc',
+      'input_method_base.h',
+      'input_method_delegate.h',
+      'input_method_factory.cc',
+      'input_method_factory.h',
+      'input_method_ibus.cc',
+      'input_method_ibus.h',
+      'mock_ibus_client.cc',
+      'mock_ibus_client.h',
+      'mock_input_method.cc',
+      'mock_input_method.h',
+      'text_input_client.cc',
+      'text_input_client.h',
+      'text_input_type.h',
+    ],
+  },
+  'sources': [
+    '<@(ime_files)',
+  ],
+  'conditions': [
+    ['use_aura==0', {
+      'sources!': [
+        '<@(ime_files)',
+      ],
+      'sources/': [
+        # gtk_im_context_util* use ui::CompositionText.
+        ['include', 'composition_text\\.(cc|h)$'],
+        # native_textfield_views* use ui::TextInputClient.
+        ['include', 'text_input_client\\.(cc|h)$'],
+      ],
+    }],
+    ['use_ibus==1', {
+      'sources!': [
+        'mock_input_method.cc',
+        'mock_input_method.h',
+      ],
+    }, {
+      # Exlude files that depend on ibus. Note that input_method_ibus.* do NOT
+      # depend on it dispite the file names.
+      'sources!': [
+        'ibus_client_impl.cc',
+        'ibus_client_impl.h',
+      ],
+    }],
+    ['use_x11==0', {
+      # Exclude files that depend on glib.
+      'sources!': [
+        'character_composer.cc',
+        'character_composer.h',
+        'ibus_client_impl.cc',
+        'ibus_client_impl.h',
+        'input_method_ibus.cc',
+        'input_method_ibus.h',
+        'mock_ibus_client.cc',
+        'mock_ibus_client.h',
+      ],
+    }],
+  ],
+}
diff --git a/ui/base/ime/ime_unittests.gypi b/ui/base/ime/ime_unittests.gypi
new file mode 100644
index 0000000..28d4cec
--- /dev/null
+++ b/ui/base/ime/ime_unittests.gypi
@@ -0,0 +1,18 @@
+# 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.
+
+{
+  'sources': [
+    'character_composer_unittest.cc',
+    'input_method_ibus_unittest.cc',
+  ],
+  'conditions': [
+    ['use_aura==0 or use_x11==0', {
+      'sources!': [
+        'character_composer_unittest.cc',
+        'input_method_ibus_unittest.cc',
+      ],
+    }],
+  ],
+}
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 6568234..92fd94d9 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -14,6 +14,9 @@
       'target_name': 'ui',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
+      'includes': [
+        'base/ime/ime.gypi',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ -131,29 +134,6 @@
         'base/gtk/tooltip_window_gtk.cc',
         'base/gtk/tooltip_window_gtk.h',
         'base/hit_test.h',
-        'base/ime/character_composer.cc',
-        'base/ime/character_composer.h',
-        'base/ime/composition_text.cc',
-        'base/ime/composition_text.h',
-        'base/ime/composition_underline.h',
-        'base/ime/ibus_client.h',
-        'base/ime/ibus_client_impl.cc',
-        'base/ime/ibus_client_impl.h',
-        'base/ime/input_method.h',
-        'base/ime/input_method_base.cc',
-        'base/ime/input_method_base.h',
-        'base/ime/input_method_delegate.h',
-        'base/ime/input_method_factory.cc',
-        'base/ime/input_method_factory.h',
-        'base/ime/input_method_ibus.cc',
-        'base/ime/input_method_ibus.h',
-        'base/ime/mock_ibus_client.cc',
-        'base/ime/mock_ibus_client.h',
-        'base/ime/mock_input_method.cc',
-        'base/ime/mock_input_method.h',
-        'base/ime/text_input_client.cc',
-        'base/ime/text_input_client.h',
-        'base/ime/text_input_type.h',
         'base/javascript_message_type.h',
         'base/keycodes/keyboard_code_conversion.cc',
         'base/keycodes/keyboard_code_conversion.h',
@@ -380,19 +360,6 @@
            ],
         }, {  # use_aura!=1
           'sources!': [
-            'base/ime/character_composer.cc',
-            'base/ime/character_composer.h',
-            'base/ime/ibus_client.h',
-            'base/ime/ibus_client_impl.cc',
-            'base/ime/ibus_client_impl.h',
-            'base/ime/input_method_factory.cc',
-            'base/ime/input_method_factory.h',
-            'base/ime/input_method_ibus.cc',
-            'base/ime/input_method_ibus.h',
-            'base/ime/mock_ibus_client.cc',
-            'base/ime/mock_ibus_client.h',
-            'base/ime/mock_input_method.cc',
-            'base/ime/mock_input_method.h',
             'gfx/native_theme_aura.cc',
             'gfx/native_theme_aura.h',
           ]
@@ -410,17 +377,7 @@
           'dependencies': [
             '../build/linux/system.gyp:ibus',
           ],
-          'sources/': [
-            ['exclude', 'base/ime/mock_input_method.cc'],
-            ['exclude', 'base/ime/mock_input_method.h'],
-          ],
-        }, { # else: use_ibus != 1
-          'sources/': [
-            ['exclude', 'base/ime/ibus_client_impl.cc'],
-            ['exclude', 'base/ime/ibus_client_impl.h'],
-          ],
         }],
-
         ['use_glib == 1', {
           'dependencies': [
             # font_gtk.cc uses fontconfig.
@@ -598,12 +555,6 @@
             'base/keycodes/keyboard_code_conversion_x.cc',
             'base/keycodes/keyboard_code_conversion_x.h',
             'base/x/',
-            'base/ime/input_method_ibus.cc',
-            'base/ime/input_method_ibus.h',
-            'base/ime/mock_ibus_client.cc',
-            'base/ime/mock_ibus_client.h',
-            'base/ime/character_composer.cc',
-            'base/ime/character_composer.h',
           ],
         }],
         ['chromeos==1', {
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index c3f2e7e..1e4fa81 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -30,6 +30,9 @@
     {
       'target_name': 'ui_unittests',
       'type': 'executable',
+      'includes': [
+        'base/ime/ime_unittests.gypi',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ -54,8 +57,6 @@
         'base/cocoa/events_mac_unittest.mm',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
-        'base/ime/character_composer_unittest.cc',
-        'base/ime/input_method_ibus_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/models/list_model_unittest.cc',
@@ -156,12 +157,6 @@
             }],
           ],
         }],
-        ['use_x11 == 0', {
-          'sources!': [
-            'base/ime/character_composer_unittest.cc',
-            'base/ime/input_method_ibus_unittest.cc',
-          ],
-        }],
         ['toolkit_uses_gtk == 1', {
           'sources': [
             'base/dragdrop/gtk_dnd_util_unittest.cc',
@@ -180,11 +175,6 @@
             'base/view_prop_unittest.cc',
             'gfx/screen_unittest.cc',
           ],
-        }, { # else: use_aura != 1
-          'sources/': [
-            ['exclude', 'base/ime/character_composer_unittest.cc'],
-            ['exclude', 'base/ime/input_method_ibus_unittest.cc'],
-          ],
         }],
       ],
     },