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

Side by Side Diff: chrome/chrome.gyp

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ['chromeos==1', { 66 ['chromeos==1', {
67 'platform_locale_settings_grd': 67 'platform_locale_settings_grd':
68 'app/resources/locale_settings_cros.grd', 68 'app/resources/locale_settings_cros.grd',
69 }], 69 }],
70 ['chromeos!=1', { 70 ['chromeos!=1', {
71 'platform_locale_settings_grd': 71 'platform_locale_settings_grd':
72 'app/resources/locale_settings_linux.grd', 72 'app/resources/locale_settings_linux.grd',
73 }], 73 }],
74 ], 74 ],
75 },], 75 },],
76 ['os_posix==1 and OS!="mac" and OS!="linux"', {
77 'platform_locale_settings_grd':
78 'app/resources/locale_settings_linux.grd',
79 },],
76 ['OS=="mac"', { 80 ['OS=="mac"', {
77 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 81 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
78 'nacl_defines': [ 82 'nacl_defines': [
79 'NACL_WINDOWS=0', 83 'NACL_WINDOWS=0',
80 'NACL_LINUX=0', 84 'NACL_LINUX=0',
81 'NACL_OSX=1', 85 'NACL_OSX=1',
82 ], 86 ],
83 'platform_locale_settings_grd': 87 'platform_locale_settings_grd':
84 'app/resources/locale_settings_mac.grd', 88 'app/resources/locale_settings_mac.grd',
85 'conditions': [ 89 'conditions': [
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 'browser/debugger/devtools_handler.h', 454 'browser/debugger/devtools_handler.h',
451 'browser/debugger/devtools_toggle_action.h', 455 'browser/debugger/devtools_toggle_action.h',
452 'browser/debugger/devtools_window.cc', 456 'browser/debugger/devtools_window.cc',
453 'browser/debugger/devtools_window.h', 457 'browser/debugger/devtools_window.h',
454 'browser/debugger/extension_ports_remote_service.cc', 458 'browser/debugger/extension_ports_remote_service.cc',
455 'browser/debugger/extension_ports_remote_service.h', 459 'browser/debugger/extension_ports_remote_service.h',
456 'browser/debugger/inspectable_tab_proxy.cc', 460 'browser/debugger/inspectable_tab_proxy.cc',
457 'browser/debugger/inspectable_tab_proxy.h', 461 'browser/debugger/inspectable_tab_proxy.h',
458 ], 462 ],
459 'conditions': [ 463 'conditions': [
460 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 464 ['toolkit_uses_gtk==1', {
461 'dependencies': [ 465 'dependencies': [
462 '../build/linux/system.gyp:gtk', 466 '../build/linux/system.gyp:gtk',
463 ], 467 ],
464 }], 468 }],
465 ], 469 ],
466 }, 470 },
467 { 471 {
468 'target_name': 'utility', 472 'target_name': 'utility',
469 'type': '<(library)', 473 'type': '<(library)',
470 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', 474 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
471 'dependencies': [ 475 'dependencies': [
472 '../base/base.gyp:base', 476 '../base/base.gyp:base',
473 '../skia/skia.gyp:skia', 477 '../skia/skia.gyp:skia',
474 ], 478 ],
475 'sources': [ 479 'sources': [
476 'utility/utility_main.cc', 480 'utility/utility_main.cc',
477 'utility/utility_thread.cc', 481 'utility/utility_thread.cc',
478 'utility/utility_thread.h', 482 'utility/utility_thread.h',
479 ], 483 ],
480 'include_dirs': [ 484 'include_dirs': [
481 '..', 485 '..',
482 ], 486 ],
483 'conditions': [ 487 'conditions': [
484 ['OS=="linux"', { 488 ['toolkit_uses_gtk==1', {
485 'dependencies': [ 489 'dependencies': [
486 '../build/linux/system.gyp:gtk', 490 '../build/linux/system.gyp:gtk',
487 ], 491 ],
488 }], 492 }],
489 ], 493 ],
490 }, 494 },
491 { 495 {
492 'target_name': 'profile_import', 496 'target_name': 'profile_import',
493 'type': '<(library)', 497 'type': '<(library)',
494 'dependencies': [ 498 'dependencies': [
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 # This target exports a hard dependency because its header files include 699 # This target exports a hard dependency because its header files include
696 # protobuf header files from sync_proto_cpp. 700 # protobuf header files from sync_proto_cpp.
697 'hard_dependency': 1, 701 'hard_dependency': 1,
698 'conditions': [ 702 'conditions': [
699 ['OS=="win"', { 703 ['OS=="win"', {
700 'sources' : [ 704 'sources' : [
701 'browser/sync/util/data_encryption.cc', 705 'browser/sync/util/data_encryption.cc',
702 'browser/sync/util/data_encryption.h', 706 'browser/sync/util/data_encryption.h',
703 ], 707 ],
704 }], 708 }],
705 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 709 ['toolkit_uses_gtk==1', {
706 'dependencies': [ 710 'dependencies': [
707 '../build/linux/system.gyp:gtk', 711 '../build/linux/system.gyp:gtk',
708 ], 712 ],
709 'link_settings': { 713 'link_settings': {
710 'libraries': [ 714 'libraries': [
711 '-lXss', 715 '-lXss',
712 ], 716 ],
713 }, 717 },
714 }], 718 }],
715 ['OS=="linux" and chromeos==1', { 719 ['OS=="linux" and chromeos==1', {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 ['OS=="win"', { 830 ['OS=="win"', {
827 'defines': [ 831 'defines': [
828 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 832 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
829 # of cloud print system, and allows to use custom implementaiton. 833 # of cloud print system, and allows to use custom implementaiton.
830 'CP_PRINT_SYSTEM_AVAILABLE', 834 'CP_PRINT_SYSTEM_AVAILABLE',
831 ], 835 ],
832 'sources': [ 836 'sources': [
833 'service/cloud_print/print_system_win.cc', 837 'service/cloud_print/print_system_win.cc',
834 ], 838 ],
835 }], 839 }],
836 ['OS=="linux"', { 840 ['toolkit_uses_gtk==1', {
837 'dependencies': [ 841 'dependencies': [
838 '../build/linux/system.gyp:gtk', 842 '../build/linux/system.gyp:gtk',
839 ], 843 ],
840 }], 844 }],
841 ['use_cups==1', { 845 ['use_cups==1', {
842 'dependencies': [ 846 'dependencies': [
843 '../printing/printing.gyp:cups', 847 '../printing/printing.gyp:cups',
844 ], 848 ],
845 'defines': [ 849 'defines': [
846 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 850 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1513 'tools/crash_service/main.cc', 1517 'tools/crash_service/main.cc',
1514 ], 1518 ],
1515 'msvs_settings': { 1519 'msvs_settings': {
1516 'VCLinkerTool': { 1520 'VCLinkerTool': {
1517 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1521 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1518 }, 1522 },
1519 }, 1523 },
1520 }, 1524 },
1521 ]}, # 'targets' 1525 ]}, # 'targets'
1522 ], # OS=="win" 1526 ], # OS=="win"
1523 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 1527 ['os_posix==1 and OS!="mac"', {
1524 'targets': [{ 1528 'targets': [{
1525 'target_name': 'packed_resources', 1529 'target_name': 'packed_resources',
1526 'type': 'none', 1530 'type': 'none',
1527 'variables': { 1531 'variables': {
1528 'repack_path': '../tools/data_pack/repack.py', 1532 'repack_path': '../tools/data_pack/repack.py',
1529 }, 1533 },
1530 'actions': [ 1534 'actions': [
1531 # TODO(mark): These actions are duplicated for the Mac in the 1535 # TODO(mark): These actions are duplicated for the Mac in the
1532 # chrome_dll target. Can they be unified? 1536 # chrome_dll target. Can they be unified?
1533 # 1537 #
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 ], 1618 ],
1615 }, 1619 },
1616 { 1620 {
1617 'destination': '<(PRODUCT_DIR)', 1621 'destination': '<(PRODUCT_DIR)',
1618 'files': [ 1622 'files': [
1619 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1623 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1620 ], 1624 ],
1621 }, 1625 },
1622 ], 1626 ],
1623 }], # targets 1627 }], # targets
1624 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1628 }], # os_posix==1 and OS!="mac"
1625 ], # 'conditions' 1629 ], # 'conditions'
1626 } 1630 }
1627 1631
1628 # Local Variables: 1632 # Local Variables:
1629 # tab-width:2 1633 # tab-width:2
1630 # indent-tabs-mode:nil 1634 # indent-tabs-mode:nil
1631 # End: 1635 # End:
1632 # vim: set expandtab tabstop=2 shiftwidth=2: 1636 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698