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

Side by Side Diff: webkit/tools/test_shell/test_shell.gypi

Issue 650015: Solaris: first set of patches to make WebKit build on Solaris. This set is mo... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 10 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 | « webkit/tools/pepper_test_plugin/pepper_test_plugin.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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'test_shell_windows_resource_files': [ 7 'test_shell_windows_resource_files': [
8 'resources/test_shell.rc', 8 'resources/test_shell.rc',
9 'resources/pan_east.cur', 9 'resources/pan_east.cur',
10 'resources/pan_middle.cur', 10 'resources/pan_middle.cur',
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 131 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
132 '<(DEPTH)/webkit/webkit.gyp:glue', 132 '<(DEPTH)/webkit/webkit.gyp:glue',
133 ], 133 ],
134 'conditions': [ 134 'conditions': [
135 # http://code.google.com/p/chromium/issues/detail?id=18337 135 # http://code.google.com/p/chromium/issues/detail?id=18337
136 ['target_arch!="x64" and target_arch!="arm"', { 136 ['target_arch!="x64" and target_arch!="arm"', {
137 'dependencies': [ 137 'dependencies': [
138 'npapi_test_plugin', 138 'npapi_test_plugin',
139 ], 139 ],
140 }], 140 }],
141 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 141 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
142 'dependencies': [ 142 'dependencies': [
143 'test_shell_resources', 143 'test_shell_resources',
144 '<(DEPTH)/build/linux/system.gyp:gtk', 144 '<(DEPTH)/build/linux/system.gyp:gtk',
145 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 145 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
146 ], 146 ],
147 # for: test_shell_gtk.cc 147 # for: test_shell_gtk.cc
148 'cflags': ['-Wno-multichar'], 148 'cflags': ['-Wno-multichar'],
149 }], 149 }],
150 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 150 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
151 # See below TODO in the Windows branch. 151 # See below TODO in the Windows branch.
152 'copies': [ 152 'copies': [
153 { 153 {
154 'destination': '<(PRODUCT_DIR)/plugins', 154 'destination': '<(PRODUCT_DIR)/plugins',
155 'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'], 155 'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
156 }, 156 },
157 ], 157 ],
158 }], 158 }],
159 ['OS=="win"', { 159 ['OS=="win"', {
160 'msvs_disabled_warnings': [ 4800 ], 160 'msvs_disabled_warnings': [ 4800 ],
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 # TODO: It would be nice to have these pulled in 285 # TODO: It would be nice to have these pulled in
286 # automatically from direct_dependent_settings in 286 # automatically from direct_dependent_settings in
287 # their various targets (net.gyp:net_resources, etc.), 287 # their various targets (net.gyp:net_resources, etc.),
288 # but that causes errors in other targets when 288 # but that causes errors in other targets when
289 # resulting .res files get referenced multiple times. 289 # resulting .res files get referenced multiple times.
290 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 290 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
291 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 291 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
292 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 292 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
293 ], 293 ],
294 }], 294 }],
295 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 295 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
296 'conditions': [ 296 'conditions': [
297 ['linux_use_tcmalloc==1', { 297 ['linux_use_tcmalloc==1', {
298 'dependencies': [ 298 'dependencies': [
299 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 299 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
300 ], 300 ],
301 }], 301 }],
302 ], 302 ],
303 'dependencies': [ 303 'dependencies': [
304 '<(DEPTH)/build/linux/system.gyp:gtk', 304 '<(DEPTH)/build/linux/system.gyp:gtk',
305 'test_shell_resources', 305 'test_shell_resources',
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 'test_shell_test.h', 438 'test_shell_test.h',
439 'text_input_controller_unittest.cc', 439 'text_input_controller_unittest.cc',
440 ], 440 ],
441 'conditions': [ 441 'conditions': [
442 ['OS=="win"', { 442 ['OS=="win"', {
443 'resource_include_dirs': [ 443 'resource_include_dirs': [
444 '<(SHARED_INTERMEDIATE_DIR)/webkit', 444 '<(SHARED_INTERMEDIATE_DIR)/webkit',
445 ], 445 ],
446 'sources': [ '<@(test_shell_windows_resource_files)' ], 446 'sources': [ '<@(test_shell_windows_resource_files)' ],
447 }], 447 }],
448 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 448 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
449 'dependencies': [ 449 'dependencies': [
450 'test_shell_pak', 450 'test_shell_pak',
451 '<(DEPTH)/build/linux/system.gyp:gtk', 451 '<(DEPTH)/build/linux/system.gyp:gtk',
452 ], 452 ],
453 'sources!': [ 453 'sources!': [
454 # TODO(port) 454 # TODO(port)
455 '../../../skia/ext/platform_canvas_unittest.cc', 455 '../../../skia/ext/platform_canvas_unittest.cc',
456 ], 456 ],
457 }], 457 }],
458 ['OS=="mac"', { 458 ['OS=="mac"', {
(...skipping 15 matching lines...) Expand all
474 '../../../skia/ext/skia_utils_mac_unittest.mm', 474 '../../../skia/ext/skia_utils_mac_unittest.mm',
475 ], 475 ],
476 }], 476 }],
477 ['OS=="win"', { 477 ['OS=="win"', {
478 'msvs_disabled_warnings': [ 4800 ], 478 'msvs_disabled_warnings': [ 4800 ],
479 }, { # else: OS!=win 479 }, { # else: OS!=win
480 'sources!': [ 480 'sources!': [
481 '../../../skia/ext/vector_canvas_unittest.cc', 481 '../../../skia/ext/vector_canvas_unittest.cc',
482 ], 482 ],
483 }], 483 }],
484 ['OS=="linux" or OS=="freebsd"', { 484 ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
485 'conditions': [ 485 'conditions': [
486 ['linux_use_tcmalloc==1', { 486 ['linux_use_tcmalloc==1', {
487 'dependencies': [ 487 'dependencies': [
488 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 488 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
489 ], 489 ],
490 }], 490 }],
491 ], 491 ],
492 }], 492 }],
493 ], 493 ],
494 }, 494 },
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 }], 560 }],
561 ['OS=="mac"', { 561 ['OS=="mac"', {
562 'product_name': 'TestNetscapePlugIn', 562 'product_name': 'TestNetscapePlugIn',
563 'product_extension': 'plugin', 563 'product_extension': 'plugin',
564 'link_settings': { 564 'link_settings': {
565 'libraries': [ 565 'libraries': [
566 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 566 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
567 ], 567 ],
568 }, 568 },
569 }], 569 }],
570 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and (target_arch=="x64 " or target_arch=="arm")', { 570 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and ( target_arch=="x64" or target_arch=="arm")', {
571 # Shared libraries need -fPIC on x86-64 571 # Shared libraries need -fPIC on x86-64
572 'cflags': ['-fPIC'] 572 'cflags': ['-fPIC']
573 }], 573 }],
574 ], 574 ],
575 }, 575 },
576 ], 576 ],
577 'conditions': [ 577 'conditions': [
578 ['target_arch!="x64" and target_arch!="arm"', { 578 ['target_arch!="x64" and target_arch!="arm"', {
579 'targets': [ 579 'targets': [
580 { 580 {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 665 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
666 ], 666 ],
667 }, 667 },
668 }], 668 }],
669 ['OS=="linux"', { 669 ['OS=="linux"', {
670 'sources!': [ 670 'sources!': [
671 # Needs simple event record type porting 671 # Needs simple event record type porting
672 '../../glue/plugins/test/plugin_windowless_test.cc', 672 '../../glue/plugins/test/plugin_windowless_test.cc',
673 ], 673 ],
674 }], 674 }],
675 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and (target_arch== "x64" or target_arch=="arm")', { 675 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd (target_arch=="x64" or target_arch=="arm")', {
676 # Shared libraries need -fPIC on x86-64 676 # Shared libraries need -fPIC on x86-64
677 'cflags': ['-fPIC'] 677 'cflags': ['-fPIC']
678 }], 678 }],
679 ], 679 ],
680 }, 680 },
681 ], 681 ],
682 }], 682 }],
683 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 683 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
684 'targets': [ 684 'targets': [
685 { 685 {
686 'target_name': 'test_shell_resources', 686 'target_name': 'test_shell_resources',
687 'type': 'none', 687 'type': 'none',
688 'actions': [ 688 'actions': [
689 { 689 {
690 'action_name': 'test_shell_resources', 690 'action_name': 'test_shell_resources',
691 'variables': { 691 'variables': {
692 'grit_path': '../../../tools/grit/grit.py', 692 'grit_path': '../../../tools/grit/grit.py',
693 'input_path': './test_shell_resources.grd', 693 'input_path': './test_shell_resources.grd',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 ], 750 ],
751 }], 751 }],
752 ], 752 ],
753 } 753 }
754 754
755 # Local Variables: 755 # Local Variables:
756 # tab-width:2 756 # tab-width:2
757 # indent-tabs-mode:nil 757 # indent-tabs-mode:nil
758 # End: 758 # End:
759 # vim: set expandtab tabstop=2 shiftwidth=2: 759 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698