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

Side by Side Diff: views/views.gyp

Issue 6904053: Remove ibus checking script from views.gyp and add use_ibus=1 option (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated Created 9 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'conditions': [ 10 'conditions': [
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 'widget/child_window_message_processor.cc', 415 'widget/child_window_message_processor.cc',
416 'widget/child_window_message_processor.h', 416 'widget/child_window_message_processor.h',
417 'widget/aero_tooltip_manager.cc', 417 'widget/aero_tooltip_manager.cc',
418 'widget/root_view_drop_target.cc', 418 'widget/root_view_drop_target.cc',
419 'widget/widget_win.cc', 419 'widget/widget_win.cc',
420 'window/hit_test.cc', 420 'window/hit_test.cc',
421 'window/native_frame_view.cc', 421 'window/native_frame_view.cc',
422 ], 422 ],
423 }], 423 }],
424 ['touchui==1', { 424 ['touchui==1', {
425 'dependencies': [
426 '../build/linux/system.gyp:ibus',
427 ],
428 'defines': ['TOUCH_UI=1'], 425 'defines': ['TOUCH_UI=1'],
429 'sources/': [ 426 'sources/': [
430 ['exclude', 'focus/accelerator_handler_gtk.cc'], 427 ['exclude', 'focus/accelerator_handler_gtk.cc'],
431 ['exclude', 'controls/menu/native_menu_gtk.cc'], 428 ['exclude', 'controls/menu/native_menu_gtk.cc'],
432 ], 429 ],
433 'conditions': [ 430 'conditions': [
434 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', { 431 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', {
435 # Exclude TouchFactory if XInput2 is not available. 432 # Exclude TouchFactory if XInput2 is not available.
436 'sources/': [ 433 'sources/': [
437 ['exclude', 'touchui/touch_factory.cc'], 434 ['exclude', 'touchui/touch_factory.cc'],
438 ['exclude', 'touchui/touch_factory.h'], 435 ['exclude', 'touchui/touch_factory.h'],
439 ], 436 ],
440 }], 437 }],
441 # TODO(suzhe): We should not check ibus version here. Instead, we 438 ['use_ibus==1', {
442 # should use a variable to control whether or not to use ibus. 439 'dependencies': [
443 ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"= =""', { 440 '../build/linux/system.gyp:ibus',
444 'defines': ['HAVE_IBUS=1'], 441 ],
445 'sources/': [ 442 'sources/': [
446 ['exclude', 'ime/input_method_gtk.cc'], 443 ['exclude', 'ime/input_method_gtk.cc'],
447 ['exclude', 'ime/input_method_gtk.h'], 444 ['exclude', 'ime/input_method_gtk.h'],
448 ], 445 ],
449 }, { # else: no ibus 446 }, { # else: use_ibus != 1
450 'sources/': [ 447 'sources/': [
451 ['exclude', 'ime/input_method_ibus.cc'], 448 ['exclude', 'ime/input_method_ibus.cc'],
452 ['exclude', 'ime/input_method_ibus.h'], 449 ['exclude', 'ime/input_method_ibus.h'],
453 ], 450 ],
454 }], 451 }],
455 ], 452 ],
456 }, { # else: touchui != 1 453 }, { # else: touchui != 1
457 'sources!': [ 454 'sources!': [
458 'ime/input_method_ibus.cc', 455 'ime/input_method_ibus.cc',
459 'ime/input_method_ibus.h', 456 'ime/input_method_ibus.h',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 ], 624 ],
628 }, 625 },
629 ], 626 ],
630 } 627 }
631 628
632 # Local Variables: 629 # Local Variables:
633 # tab-width:2 630 # tab-width:2
634 # indent-tabs-mode:nil 631 # indent-tabs-mode:nil
635 # End: 632 # End:
636 # vim: set expandtab tabstop=2 shiftwidth=2: 633 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698