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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/test_shell/test_shell.gyp

Issue 63152: Switching webkit to gyp on windows. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/default_plugin/default_plugin.vcproj ('k') | webkit/tools/test_shell/test_shell.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.gyp
===================================================================
--- webkit/tools/test_shell/test_shell.gyp (revision 13452)
+++ webkit/tools/test_shell/test_shell.gyp (working copy)
@@ -24,6 +24,7 @@
'../../webkit.gyp:webkit',
],
'sources': [
+ '../../glue/simple_clipboard_impl.cc',
'mac/DumpRenderTreePasteboard.h',
'mac/DumpRenderTreePasteboard.m',
'mac/test_shell_webview.h',
@@ -110,17 +111,21 @@
'-lcomctl32.lib',
],
},
+ 'include_dirs': [
+ '.',
+ ],
'dependencies': [
- '../../../breakpad/breakpad.gyp:breakpad_handler',
+ '../../../build/temp_gyp/breakpad.gyp:breakpad_handler',
'../../default_plugin/default_plugin.gyp:default_plugin',
],
}, { # else: OS!=win
'sources/': [
- ['exclude', '_win\\.cc$']
+ ['exclude', '_win\\.cc$'],
],
'sources!': [
'drag_delegate.cc',
'drop_delegate.cc',
+ '../../glue/simple_clipboard_impl.cc',
],
}],
],
@@ -129,6 +134,7 @@
'target_name': 'test_shell',
'type': 'executable',
'mac_bundle': 1,
+ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
'dependencies': [
'test_shell_common',
],
@@ -153,6 +159,23 @@
'INFOPLIST_FILE': 'mac/Info.plist',
},
'conditions': [
+ ['OS=="win"', {
+ 'sources': [
+ 'resources/test_shell.rc',
+ 'resources/pan_east.cur',
+ 'resources/pan_middle.cur',
+ 'resources/pan_north.cur',
+ 'resources/pan_north_east.cur',
+ 'resources/pan_north_west.cur',
+ 'resources/pan_south.cur',
+ 'resources/pan_south_east.cur',
+ 'resources/pan_south_west.cur',
+ 'resources/pan_west.cur',
+ 'resources/small.ico',
+ 'resources/test_shell.ico',
+ 'resource.h',
+ ],
+ }],
['OS=="linux"', {
'dependencies': [
'../../../build/linux/system.gyp:gtk',
@@ -214,6 +237,7 @@
{
'target_name': 'test_shell_tests',
'type': 'executable',
+ 'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867',
'dependencies': [
'test_shell_common',
'../../../skia/skia.gyp:skia',
@@ -221,6 +245,7 @@
],
'sources': [
'../../../skia/ext/convolver_unittest.cc',
+ '../../../skia/ext/image_operations_unittest.cc',
'../../../skia/ext/platform_canvas_unittest.cc',
'../../../skia/ext/vector_canvas_unittest.cc',
'../../glue/bookmarklet_unittest.cc',
@@ -246,6 +271,7 @@
'../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
'../webcore_unit_tests/UniscribeHelper_unittest.cpp',
'../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
+ '../webcore_unit_tests/TransparencyWin_unittest.cpp',
'image_decoder_unittest.cc',
'image_decoder_unittest.h',
'keyboard_unittest.cc',
@@ -258,6 +284,23 @@
'text_input_controller_unittest.cc',
],
'conditions': [
+ ['OS=="win"', {
+ 'sources': [
+ 'resources/test_shell.rc',
+ 'resources/pan_east.cur',
+ 'resources/pan_middle.cur',
+ 'resources/pan_north.cur',
+ 'resources/pan_north_east.cur',
+ 'resources/pan_north_west.cur',
+ 'resources/pan_south.cur',
+ 'resources/pan_south_east.cur',
+ 'resources/pan_south_west.cur',
+ 'resources/pan_west.cur',
+ 'resources/small.ico',
+ 'resources/test_shell.ico',
+ 'resource.h',
+ ],
+ }],
['OS=="linux"', {
'dependencies': [
# Linux tests use the built test_shell beside the test
@@ -279,8 +322,10 @@
'msvs_disabled_warnings': [ 4800 ],
}, { # else: OS!=win
'sources!': [
+ '../../../skia/ext/image_operations_unittest.cc',
'../../../skia/ext/vector_canvas_unittest.cc',
'../webcore_unit_tests/UniscribeHelper_unittest.cpp',
+ '../webcore_unit_tests/TransparencyWin_unittest.cpp',
'plugin_tests.cc'
],
}],
@@ -322,14 +367,13 @@
},
],
}],
- # TODO: change this condition to 'OS!="mac"'
- # when Windows is ready for the plugins, too.
- ['OS=="linux"', {
+ ['OS!="mac"', {
'targets': [
{
'target_name': 'npapi_test_plugin',
'type': 'loadable_module',
'product_dir': '<(PRODUCT_DIR)/plugins',
+ 'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
'dependencies': [
'../../../base/base.gyp:base',
'../../../third_party/icu38/icu38.gyp:icuuc',
@@ -337,19 +381,37 @@
],
'sources': [
'../../glue/plugins/test/npapi_constants.cc',
+ '../../glue/plugins/test/npapi_constants.h',
'../../glue/plugins/test/npapi_test.cc',
+ '../../glue/plugins/test/npapi_test.def',
+ '../../glue/plugins/test/npapi_test.rc',
'../../glue/plugins/test/plugin_arguments_test.cc',
+ '../../glue/plugins/test/plugin_arguments_test.h',
'../../glue/plugins/test/plugin_client.cc',
+ '../../glue/plugins/test/plugin_client.h',
'../../glue/plugins/test/plugin_delete_plugin_in_stream_test.cc',
- '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
+ '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.h',
'../../glue/plugins/test/plugin_get_javascript_url_test.cc',
+ '../../glue/plugins/test/plugin_get_javascript_url_test.h',
'../../glue/plugins/test/plugin_geturl_test.cc',
+ '../../glue/plugins/test/plugin_geturl_test.h',
'../../glue/plugins/test/plugin_javascript_open_popup.cc',
+ '../../glue/plugins/test/plugin_javascript_open_popup.h',
'../../glue/plugins/test/plugin_new_fails_test.cc',
+ '../../glue/plugins/test/plugin_new_fails_test.h',
'../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+ '../../glue/plugins/test/plugin_npobject_lifetime_test.h',
'../../glue/plugins/test/plugin_npobject_proxy_test.cc',
+ '../../glue/plugins/test/plugin_npobject_proxy_test.h',
+ '../../glue/plugins/test/plugin_private_test.cc',
+ '../../glue/plugins/test/plugin_private_test.h',
'../../glue/plugins/test/plugin_test.cc',
+ '../../glue/plugins/test/plugin_test.h',
'../../glue/plugins/test/plugin_window_size_test.cc',
+ '../../glue/plugins/test/plugin_window_size_test.h',
+ '../../glue/plugins/test/plugin_windowless_test.cc',
+ '../../glue/plugins/test/plugin_windowless_test.h',
+ '../../glue/plugins/test/resource.h',
],
'include_dirs': [
'../../..',
@@ -362,23 +424,33 @@
# plugin_npobject_lifetime_test.cc has win32-isms
# (HWND, CALLBACK).
# plugin_window_size_test.cc has w32-isms including HWND.
- '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
+ '../../glue/plugins/test/plugin_client.cc',
'../../glue/plugins/test/plugin_javascript_open_popup.cc',
- '../../glue/plugins/test/plugin_client.cc',
'../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+ '../../glue/plugins/test/plugin_private_test.cc',
'../../glue/plugins/test/plugin_window_size_test.cc',
+ '../../glue/plugins/test/plugin_windowless_test.cc',
],
}],
+ ['OS!="win"', {
+ 'sources!': [
+ '../../glue/plugins/test/npapi_test.def',
+ '../../glue/plugins/test/npapi_test.rc',
+ ],
+ }],
],
},
{
'target_name': 'npapi_layout_test_plugin',
'type': 'loadable_module',
'product_dir': '<(PRODUCT_DIR)/plugins',
+ 'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
'sources': [
- '../npapi_layout_test_plugin/main.cpp',
'../npapi_layout_test_plugin/PluginObject.cpp',
'../npapi_layout_test_plugin/TestObject.cpp',
+ '../npapi_layout_test_plugin/main.cpp',
+ '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+ '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
],
'include_dirs': [
'../../..',
@@ -387,6 +459,15 @@
'../../../third_party/npapi/npapi.gyp:npapi',
'../../webkit.gyp:wtf',
],
+ 'msvs_disabled_warnings': [ 4996 ],
+ 'conditions': [
+ ['OS!="win"', {
+ 'sources!': [
+ '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+ '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+ ],
+ }],
+ ],
},
],
}],
« no previous file with comments | « webkit/default_plugin/default_plugin.vcproj ('k') | webkit/tools/test_shell/test_shell.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698