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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 8150002: Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a global... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « chrome_frame/bho.h ('k') | chrome_frame/chrome_frame_activex.h » ('j') | 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 'variables': { 9 'variables': {
10 'version_py_path': '../tools/build/version.py', 10 'version_py_path': '../tools/build/version.py',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'crash_reporting/crash_reporting.gyp:minidump_test', 55 'crash_reporting/crash_reporting.gyp:minidump_test',
56 'crash_reporting/crash_reporting.gyp:vectored_handler_tests', 56 'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
57 ], 57 ],
58 }, 58 },
59 { 59 {
60 # Builds our IDL file to the shared intermediate directory. 60 # Builds our IDL file to the shared intermediate directory.
61 'target_name': 'chrome_tab_idl', 61 'target_name': 'chrome_tab_idl',
62 'type': 'none', 62 'type': 'none',
63 'msvs_settings': { 63 'msvs_settings': {
64 'VCMIDLTool': { 64 'VCMIDLTool': {
65 'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)', 65 'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
66 }, 66 },
67 }, 67 },
68 'sources': [ 68 'sources': [
69 'chrome_tab.idl', 69 'chrome_tab.idl',
70 ], 70 ],
71 # Add the output dir for those who depend on us. 71 # Add the output dir for those who depend on us.
72 'direct_dependent_settings': { 72 'direct_dependent_settings': {
73 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'], 73 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'],
74 }, 74 },
75 }, 75 },
76 { 76 {
77 'target_name': 'chrome_frame_unittests', 77 'target_name': 'chrome_frame_unittests',
78 'type': 'executable', 78 'type': 'executable',
79 'dependencies': [ 79 'dependencies': [
80 '../base/base.gyp:test_support_base', 80 '../base/base.gyp:test_support_base',
81 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', 81 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
82 '../net/net.gyp:net', 82 '../net/net.gyp:net',
83 '../testing/gmock.gyp:gmock', 83 '../testing/gmock.gyp:gmock',
84 '../testing/gtest.gyp:gtest', 84 '../testing/gtest.gyp:gtest',
85 'chrome_frame_launcher.gyp:chrome_frame_helper_lib', 85 'chrome_frame_launcher.gyp:chrome_frame_helper_lib',
86 'chrome_frame_ie', 86 'chrome_frame_ie',
87 'chrome_frame_strings', 87 'chrome_frame_strings',
88 'chrome_tab_idl', 88 'chrome_tab_idl',
89 'locales/locales.gyp:*', 89 'locales/locales.gyp:*',
90 ], 90 ],
91 'sources': [ 91 'sources': [
92 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 92 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
93 'chrome_frame_unittest_main.cc', 93 'chrome_frame_unittest_main.cc',
94 'chrome_launcher.cc', 94 'chrome_launcher.cc',
95 'chrome_launcher.h', 95 'chrome_launcher.h',
96 'chrome_launcher_unittest.cc', 96 'chrome_launcher_unittest.cc',
97 'function_stub_unittest.cc', 97 'function_stub_unittest.cc',
98 'renderer_glue.cc', 98 'renderer_glue.cc',
99 'test/chrome_tab_mocks.h', 99 'test/chrome_tab_mocks.h',
100 'test/chrome_frame_test_utils.h', 100 'test/chrome_frame_test_utils.h',
101 'test/chrome_frame_test_utils.cc', 101 'test/chrome_frame_test_utils.cc',
102 'test/com_message_event_unittest.cc', 102 'test/com_message_event_unittest.cc',
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 'test/test_server_test.cc', 242 'test/test_server_test.cc',
243 'test/test_with_web_server.cc', 243 'test/test_with_web_server.cc',
244 'test/test_with_web_server.h', 244 'test/test_with_web_server.h',
245 'test/ui_test.cc', 245 'test/ui_test.cc',
246 'test/urlmon_moniker_tests.h', 246 'test/urlmon_moniker_tests.h',
247 'test/urlmon_moniker_integration_test.cc', 247 'test/urlmon_moniker_integration_test.cc',
248 'test/url_request_test.cc', 248 'test/url_request_test.cc',
249 'test/win_event_receiver.cc', 249 'test/win_event_receiver.cc',
250 'test/win_event_receiver.h', 250 'test/win_event_receiver.h',
251 'chrome_launcher_version.rc', 251 'chrome_launcher_version.rc',
252 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 252 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
253 'test_utils.cc', 253 'test_utils.cc',
254 'test_utils.h', 254 'test_utils.h',
255 ], 255 ],
256 'include_dirs': [ 256 'include_dirs': [
257 '<(DEPTH)/third_party/wtl/include', 257 '<(DEPTH)/third_party/wtl/include',
258 '<(DEPTH)/breakpad/src', 258 '<(DEPTH)/breakpad/src',
259 ], 259 ],
260 'resource_include_dirs': [ 260 'resource_include_dirs': [
261 '<(INTERMEDIATE_DIR)', 261 '<(INTERMEDIATE_DIR)',
262 ], 262 ],
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'locales/locales.gyp:*', 317 'locales/locales.gyp:*',
318 'npchrome_frame', 318 'npchrome_frame',
319 ], 319 ],
320 'sources': [ 320 'sources': [
321 '../base/test/perf_test_suite.h', 321 '../base/test/perf_test_suite.h',
322 '../base/perftimer.cc', 322 '../base/perftimer.cc',
323 '../base/test/test_file_util.h', 323 '../base/test/test_file_util.h',
324 '../chrome/test/base/chrome_process_util.cc', 324 '../chrome/test/base/chrome_process_util.cc',
325 '../chrome/test/base/chrome_process_util.h', 325 '../chrome/test/base/chrome_process_util.h',
326 '../chrome/test/ui/ui_test.cc', 326 '../chrome/test/ui/ui_test.cc',
327 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 327 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
328 'test/chrome_frame_test_utils.cc', 328 'test/chrome_frame_test_utils.cc',
329 'test/chrome_frame_test_utils.h', 329 'test/chrome_frame_test_utils.h',
330 'test/perf/chrome_frame_perftest.cc', 330 'test/perf/chrome_frame_perftest.cc',
331 'test/perf/chrome_frame_perftest.h', 331 'test/perf/chrome_frame_perftest.h',
332 'test/perf/run_all.cc', 332 'test/perf/run_all.cc',
333 'test/perf/silverlight.cc', 333 'test/perf/silverlight.cc',
334 'test/simulate_input.cc', 334 'test/simulate_input.cc',
335 'test/simulate_input.h', 335 'test/simulate_input.h',
336 'test_utils.cc', 336 'test_utils.cc',
337 'test_utils.h', 337 'test_utils.h',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 'test/win_event_receiver.cc', 407 'test/win_event_receiver.cc',
408 'test/win_event_receiver.h', 408 'test/win_event_receiver.h',
409 'test/net/fake_external_tab.cc', 409 'test/net/fake_external_tab.cc',
410 'test/net/fake_external_tab.h', 410 'test/net/fake_external_tab.h',
411 'test/net/process_singleton_subclass.cc', 411 'test/net/process_singleton_subclass.cc',
412 'test/net/process_singleton_subclass.h', 412 'test/net/process_singleton_subclass.h',
413 'test/net/test_automation_provider.cc', 413 'test/net/test_automation_provider.cc',
414 'test/net/test_automation_provider.h', 414 'test/net/test_automation_provider.h',
415 'test/net/test_automation_resource_message_filter.cc', 415 'test/net/test_automation_resource_message_filter.cc',
416 'test/net/test_automation_resource_message_filter.h', 416 'test/net/test_automation_resource_message_filter.h',
417 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 417 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
418 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 418 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
419 'test_utils.cc', 419 'test_utils.cc',
420 'test_utils.h', 420 'test_utils.h',
421 ], 421 ],
422 'conditions': [ 422 'conditions': [
423 ['OS=="win"', { 423 ['OS=="win"', {
424 'link_settings': { 424 'link_settings': {
425 'libraries': [ 425 'libraries': [
426 '-loleacc.lib', 426 '-loleacc.lib',
427 ], 427 ],
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 'test/chrome_frame_test_utils.cc', 478 'test/chrome_frame_test_utils.cc',
479 'test/chrome_frame_test_utils.h', 479 'test/chrome_frame_test_utils.h',
480 'test/ie_event_sink.cc', 480 'test/ie_event_sink.cc',
481 'test/ie_event_sink.h', 481 'test/ie_event_sink.h',
482 'test_utils.cc', 482 'test_utils.cc',
483 'test_utils.h', 483 'test_utils.h',
484 'test/simulate_input.cc', 484 'test/simulate_input.cc',
485 'test/simulate_input.h', 485 'test/simulate_input.h',
486 'test/win_event_receiver.cc', 486 'test/win_event_receiver.cc',
487 'test/win_event_receiver.h', 487 'test/win_event_receiver.h',
488 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 488 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
489 '../base/test/test_file_util_win.cc', 489 '../base/test/test_file_util_win.cc',
490 '../chrome/test/automation/proxy_launcher.cc', 490 '../chrome/test/automation/proxy_launcher.cc',
491 '../chrome/test/automation/proxy_launcher.h', 491 '../chrome/test/automation/proxy_launcher.h',
492 '../chrome/test/base/chrome_process_util.cc', 492 '../chrome/test/base/chrome_process_util.cc',
493 '../chrome/test/base/chrome_process_util.h', 493 '../chrome/test/base/chrome_process_util.h',
494 '../chrome/test/ui/ui_test.cc', 494 '../chrome/test/ui/ui_test.cc',
495 '../chrome/test/ui/ui_test.h', 495 '../chrome/test/ui/ui_test.h',
496 '../chrome/test/ui/ui_test_suite.cc', 496 '../chrome/test/ui/ui_test_suite.cc',
497 '../chrome/test/ui/ui_test_suite.h', 497 '../chrome/test/ui/ui_test_suite.h',
498 ], 498 ],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 'test/mock_ie_event_sink_test.h', 554 'test/mock_ie_event_sink_test.h',
555 'test/run_all_unittests.cc', 555 'test/run_all_unittests.cc',
556 'test/simulate_input.cc', 556 'test/simulate_input.cc',
557 'test/simulate_input.h', 557 'test/simulate_input.h',
558 'test/test_server.cc', 558 'test/test_server.cc',
559 'test/test_server.h', 559 'test/test_server.h',
560 'test/test_with_web_server.cc', 560 'test/test_with_web_server.cc',
561 'test/test_with_web_server.h', 561 'test/test_with_web_server.h',
562 'test/win_event_receiver.cc', 562 'test/win_event_receiver.cc',
563 'test/win_event_receiver.h', 563 'test/win_event_receiver.h',
564 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 564 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
565 'chrome_tab.idl', 565 'chrome_tab.idl',
566 'renderer_glue.cc', 566 'renderer_glue.cc',
567 'test_utils.cc', 567 'test_utils.cc',
568 'test_utils.h', 568 'test_utils.h',
569 ], 569 ],
570 'include_dirs': [ 570 'include_dirs': [
571 '<(DEPTH)/third_party/wtl/include', 571 '<(DEPTH)/third_party/wtl/include',
572 '<(DEPTH)/breakpad/src', 572 '<(DEPTH)/breakpad/src',
573 # To allow including "chrome_tab.h"
574 '<(INTERMEDIATE_DIR)',
575 ], 573 ],
576 'resource_include_dirs': [ 574 'resource_include_dirs': [
577 '<(INTERMEDIATE_DIR)', 575 '<(INTERMEDIATE_DIR)',
578 ], 576 ],
579 'conditions': [ 577 'conditions': [
580 ['OS=="win"', { 578 ['OS=="win"', {
581 'link_settings': { 579 'link_settings': {
582 'libraries': [ 580 'libraries': [
583 '-loleacc.lib', 581 '-loleacc.lib',
584 ], 582 ],
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 'target_name': 'chrome_frame_utils', 618 'target_name': 'chrome_frame_utils',
621 # The intent is that shared util code can be built into a separate lib. 619 # The intent is that shared util code can be built into a separate lib.
622 'type': 'static_library', 620 'type': 'static_library',
623 'dependencies': [ 621 'dependencies': [
624 '../base/base.gyp:base_i18n', 622 '../base/base.gyp:base_i18n',
625 '../breakpad/breakpad.gyp:breakpad_handler', 623 '../breakpad/breakpad.gyp:breakpad_handler',
626 '../chrome/chrome.gyp:chrome_version_header', 624 '../chrome/chrome.gyp:chrome_version_header',
627 ], 625 ],
628 'include_dirs': [ 626 'include_dirs': [
629 # To allow including "version.h" 627 # To allow including "version.h"
628 # TODO(grt): remove this as per http://crbug.com/99368
630 '<(SHARED_INTERMEDIATE_DIR)', 629 '<(SHARED_INTERMEDIATE_DIR)',
631 ], 630 ],
632 'sources': [ 631 'sources': [
633 'crash_server_init.cc', 632 'crash_server_init.cc',
634 'crash_server_init.h', 633 'crash_server_init.h',
635 'simple_resource_loader.cc', 634 'simple_resource_loader.cc',
636 'simple_resource_loader.h', 635 'simple_resource_loader.h',
637 ], 636 ],
638 }, 637 },
639 { 638 {
(...skipping 28 matching lines...) Expand all
668 'chrome_active_document.cc', 667 'chrome_active_document.cc',
669 'chrome_active_document.h', 668 'chrome_active_document.h',
670 'chrome_active_document.rgs', 669 'chrome_active_document.rgs',
671 'chrome_frame_activex.cc', 670 'chrome_frame_activex.cc',
672 'chrome_frame_activex.h', 671 'chrome_frame_activex.h',
673 'chrome_frame_activex.rgs', 672 'chrome_frame_activex.rgs',
674 'chrome_frame_activex_base.h', 673 'chrome_frame_activex_base.h',
675 'chrome_protocol.cc', 674 'chrome_protocol.cc',
676 'chrome_protocol.h', 675 'chrome_protocol.h',
677 'chrome_protocol.rgs', 676 'chrome_protocol.rgs',
678 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 677 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
679 'com_message_event.cc', 678 'com_message_event.cc',
680 'com_message_event.h', 679 'com_message_event.h',
681 'com_type_info_holder.cc', 680 'com_type_info_holder.cc',
682 'com_type_info_holder.h', 681 'com_type_info_holder.h',
683 'delete_chrome_history.cc', 682 'delete_chrome_history.cc',
684 'delete_chrome_history.h', 683 'delete_chrome_history.h',
685 'dll_redirector.cc', 684 'dll_redirector.cc',
686 'dll_redirector.h', 685 'dll_redirector.h',
687 'exception_barrier.cc', 686 'exception_barrier.cc',
688 'exception_barrier.h', 687 'exception_barrier.h',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 'urlmon_upload_data_stream.cc', 737 'urlmon_upload_data_stream.cc',
739 'urlmon_upload_data_stream.h', 738 'urlmon_upload_data_stream.h',
740 'utils.h', 739 'utils.h',
741 'utils.cc', 740 'utils.cc',
742 'vtable_patch_manager.cc', 741 'vtable_patch_manager.cc',
743 'vtable_patch_manager.h', 742 'vtable_patch_manager.h',
744 '../third_party/active_doc/in_place_menu.h', 743 '../third_party/active_doc/in_place_menu.h',
745 '../third_party/active_doc/ole_document_impl.h', 744 '../third_party/active_doc/ole_document_impl.h',
746 ], 745 ],
747 'include_dirs': [ 746 'include_dirs': [
748 '<(INTERMEDIATE_DIR)/../chrome_frame',
749 '<(DEPTH)/third_party/wtl/include', 747 '<(DEPTH)/third_party/wtl/include',
750 ], 748 ],
751 'conditions': [ 749 'conditions': [
752 ['OS=="win"', { 750 ['OS=="win"', {
753 # NOTE(slightlyoff): 751 # NOTE(slightlyoff):
754 # this is a fix for the include dirs length limit on the resource 752 # this is a fix for the include dirs length limit on the resource
755 # compiler, tickled by the xul_include_dirs variable 753 # compiler, tickled by the xul_include_dirs variable
756 'resource_include_dirs': [ 754 'resource_include_dirs': [
757 '<(INTERMEDIATE_DIR)' 755 '<(INTERMEDIATE_DIR)'
758 ], 756 ],
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 '../chrome/chrome.gyp:chrome_dll', 850 '../chrome/chrome.gyp:chrome_dll',
853 '../chrome/chrome.gyp:chrome_version_resources', 851 '../chrome/chrome.gyp:chrome_version_resources',
854 '../chrome/chrome.gyp:common', 852 '../chrome/chrome.gyp:common',
855 ], 853 ],
856 'sources': [ 854 'sources': [
857 'chrome_frame_elevation.rgs', 855 'chrome_frame_elevation.rgs',
858 'chrome_frame_reporting.cc', 856 'chrome_frame_reporting.cc',
859 'chrome_frame_reporting.h', 857 'chrome_frame_reporting.h',
860 'chrome_tab.cc', 858 'chrome_tab.cc',
861 'chrome_tab.def', 859 'chrome_tab.def',
862 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 860 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
863 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can 861 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
864 # figure out something more gyp-ish. 862 # figure out something more gyp-ish.
865 'resources/tlb_resource.rc', 863 'resources/tlb_resource.rc',
866 'chrome_tab.rgs', 864 'chrome_tab.rgs',
867 'chrome_tab_version.rc', 865 'chrome_tab_version.rc',
868 'renderer_glue.cc', 866 'renderer_glue.cc',
869 'resource.h', 867 'resource.h',
870 ], 868 ],
871 'include_dirs': [ 869 'include_dirs': [
872 # For chrome_tab.h 870 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
873 '<(SHARED_INTERMEDIATE_DIR)', 871 ],
874 '<(INTERMEDIATE_DIR)/../npchrome_frame', 872 'resource_include_dirs': [
873 # To pick up chrome_tab.tlb
874 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame'
875 ], 875 ],
876 'conditions': [ 876 'conditions': [
877 ['OS=="win"', { 877 ['OS=="win"', {
878 # NOTE(slightlyoff): 878 # NOTE(slightlyoff):
879 # this is a fix for the include dirs length limit on the resource 879 # this is a fix for the include dirs length limit on the resource
880 # compiler, tickled by the xul_include_dirs variable 880 # compiler, tickled by the xul_include_dirs variable
881 'resource_include_dirs': [ 881 'resource_include_dirs': [
882 '<(INTERMEDIATE_DIR)' 882 '<(INTERMEDIATE_DIR)'
883 ], 883 ],
884 'sources': [ 884 'sources': [
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 # Use outputs of this action as inputs for the main target build. 1047 # Use outputs of this action as inputs for the main target build.
1048 # Seems as a misnomer but makes this happy on Linux (scons). 1048 # Seems as a misnomer but makes this happy on Linux (scons).
1049 'process_outputs_as_sources': 1, 1049 'process_outputs_as_sources': 1,
1050 }, 1050 },
1051 ], 1051 ],
1052 }, 1052 },
1053 ], 1053 ],
1054 }, ], # 'coverage!=0' 1054 }, ], # 'coverage!=0'
1055 ], # 'conditions' 1055 ], # 'conditions'
1056 } 1056 }
OLDNEW
« no previous file with comments | « chrome_frame/bho.h ('k') | chrome_frame/chrome_frame_activex.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698