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

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

Issue 42340: Update the gyp Linux build: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 | « third_party/libxml/libxml.gyp ('k') | webkit/webkit.gyp » ('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) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../../../build/common.gypi', 10 '../../../build/common.gypi',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 '../../../net/net.gyp:net', 79 '../../../net/net.gyp:net',
80 '../../webkit.gyp:glue', 80 '../../webkit.gyp:glue',
81 '../../webkit.gyp:webkit', 81 '../../webkit.gyp:webkit',
82 ], 82 ],
83 'conditions': [ 83 'conditions': [
84 ['OS=="linux"', { 84 ['OS=="linux"', {
85 'dependencies': [ 85 'dependencies': [
86 'test_shell_resources', 86 'test_shell_resources',
87 'npapi_layout_test_plugin', 87 'npapi_layout_test_plugin',
88 'npapi_test_plugin', 88 'npapi_test_plugin',
89 '../../../build/linux/system.gyp:gtk',
89 ], 90 ],
90 # for: test_shell_gtk.cc 91 # for: test_shell_gtk.cc
91 'cflags': ['-Wno-multichar'], 92 'cflags': ['-Wno-multichar'],
92 }, { # else: OS!=linux 93 }, { # else: OS!=linux
93 'sources/': [ 94 'sources/': [
94 ['exclude', '_gtk\\.cc$'] 95 ['exclude', '_gtk\\.cc$']
95 ], 96 ],
96 }], 97 }],
97 ['OS=="mac"', { 98 ['OS=="mac"', {
98 'sources': [ 99 'sources': [
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 # that automatically sets the correct INFOPLIST_FILE setting and adds 154 # that automatically sets the correct INFOPLIST_FILE setting and adds
154 # the file to a source group. 155 # the file to a source group.
155 'mac/Info.plist', 156 'mac/Info.plist',
156 ], 157 ],
157 'xcode_settings': { 158 'xcode_settings': {
158 'INFOPLIST_FILE': 'mac/Info.plist', 159 'INFOPLIST_FILE': 'mac/Info.plist',
159 }, 160 },
160 'conditions': [ 161 'conditions': [
161 ['OS=="linux"', { 162 ['OS=="linux"', {
162 'dependencies': [ 163 'dependencies': [
164 '../../../build/linux/system.gyp:gtk',
163 '../../../net/net.gyp:net_resources', 165 '../../../net/net.gyp:net_resources',
164 '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak 166 '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak
165 'test_shell_resources', 167 'test_shell_resources',
166 ], 168 ],
167 'actions': [ 169 'actions': [
168 { 170 {
169 'action_name': 'test_shell_repack', 171 'action_name': 'test_shell_repack',
170 'inputs': [ 172 'inputs': [
171 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 173 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
172 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak' , 174 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak' ,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 'layout_test_controller_unittest.cc', 256 'layout_test_controller_unittest.cc',
255 'node_leak_test.cc', 257 'node_leak_test.cc',
256 'plugin_tests.cc', 258 'plugin_tests.cc',
257 'run_all_tests.cc', 259 'run_all_tests.cc',
258 'test_shell_test.cc', 260 'test_shell_test.cc',
259 'test_shell_test.h', 261 'test_shell_test.h',
260 'text_input_controller_unittest.cc', 262 'text_input_controller_unittest.cc',
261 ], 263 ],
262 'conditions': [ 264 'conditions': [
263 ['OS=="linux"', { 265 ['OS=="linux"', {
266 'dependencies': [
267 '../../../build/linux/system.gyp:gtk',
268 ],
264 'sources!': [ 269 'sources!': [
265 # TODO(port) 270 # TODO(port)
266 '../../../skia/ext/platform_canvas_unittest.cc', 271 '../../../skia/ext/platform_canvas_unittest.cc',
267 '../../glue/webplugin_impl_unittest.cc', 272 '../../glue/webplugin_impl_unittest.cc',
268 ], 273 ],
269 }], 274 }],
270 ['OS=="mac"', { 275 ['OS=="mac"', {
271 # mac tests load the resources from the built test_shell beside the 276 # mac tests load the resources from the built test_shell beside the
272 # test 277 # test
273 'dependencies': ['test_shell'], 278 'dependencies': ['test_shell'],
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 '../../glue/plugins/test/plugin_execute_script_delete_test.cc', 346 '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
342 '../../glue/plugins/test/plugin_get_javascript_url_test.cc', 347 '../../glue/plugins/test/plugin_get_javascript_url_test.cc',
343 '../../glue/plugins/test/plugin_geturl_test.cc', 348 '../../glue/plugins/test/plugin_geturl_test.cc',
344 '../../glue/plugins/test/plugin_javascript_open_popup.cc', 349 '../../glue/plugins/test/plugin_javascript_open_popup.cc',
345 '../../glue/plugins/test/plugin_new_fails_test.cc', 350 '../../glue/plugins/test/plugin_new_fails_test.cc',
346 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc', 351 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
347 '../../glue/plugins/test/plugin_npobject_proxy_test.cc', 352 '../../glue/plugins/test/plugin_npobject_proxy_test.cc',
348 '../../glue/plugins/test/plugin_test.cc', 353 '../../glue/plugins/test/plugin_test.cc',
349 '../../glue/plugins/test/plugin_window_size_test.cc', 354 '../../glue/plugins/test/plugin_window_size_test.cc',
350 ], 355 ],
356 'include_dirs': [
357 '../../..',
358 ],
351 'conditions': [ 359 'conditions': [
352 ['OS=="linux"', { 360 ['OS=="linux"', {
353 'sources!': [ 361 'sources!': [
354 # TODO(port): Port these. 362 # TODO(port): Port these.
355 # plugin_client.cc includes not ported headers. 363 # plugin_client.cc includes not ported headers.
356 # plugin_npobject_lifetime_test.cc has win32-isms 364 # plugin_npobject_lifetime_test.cc has win32-isms
357 # (HWND, CALLBACK). 365 # (HWND, CALLBACK).
358 # plugin_window_size_test.cc has w32-isms including HWND. 366 # plugin_window_size_test.cc has w32-isms including HWND.
359 '../../glue/plugins/test/plugin_execute_script_delete_test.cc', 367 '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
360 '../../glue/plugins/test/plugin_javascript_open_popup.cc', 368 '../../glue/plugins/test/plugin_javascript_open_popup.cc',
361 '../../glue/plugins/test/plugin_client.cc', 369 '../../glue/plugins/test/plugin_client.cc',
362 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc', 370 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
363 '../../glue/plugins/test/plugin_window_size_test.cc', 371 '../../glue/plugins/test/plugin_window_size_test.cc',
364 ], 372 ],
365 }], 373 }],
366 ], 374 ],
367 }, 375 },
368 { 376 {
369 'target_name': 'npapi_layout_test_plugin', 377 'target_name': 'npapi_layout_test_plugin',
370 'type': 'loadable_module', 378 'type': 'loadable_module',
371 'product_dir': '<(PRODUCT_DIR)/plugins', 379 'product_dir': '<(PRODUCT_DIR)/plugins',
372 'sources': [ 380 'sources': [
373 '../npapi_layout_test_plugin/main.cpp', 381 '../npapi_layout_test_plugin/main.cpp',
374 '../npapi_layout_test_plugin/PluginObject.cpp', 382 '../npapi_layout_test_plugin/PluginObject.cpp',
375 '../npapi_layout_test_plugin/TestObject.cpp', 383 '../npapi_layout_test_plugin/TestObject.cpp',
376 ], 384 ],
385 'include_dirs': [
386 '../../..',
387 ],
377 'dependencies': [ 388 'dependencies': [
378 '../../../third_party/npapi/npapi.gyp:npapi', 389 '../../../third_party/npapi/npapi.gyp:npapi',
379 '../../webkit.gyp:wtf', 390 '../../webkit.gyp:wtf',
380 ], 391 ],
381 }, 392 },
382 ], 393 ],
383 }], 394 }],
384 ], 395 ],
385 } 396 }
OLDNEW
« no previous file with comments | « third_party/libxml/libxml.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698