diff options
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp')
| -rw-r--r-- | Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp | 105 |
1 files changed, 67 insertions, 38 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp index 982c767fd..4145b9cc0 100644 --- a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp +++ b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp @@ -78,6 +78,7 @@ 'target_name': 'TestRunner', 'type': 'static_library', 'dependencies': [ + 'TestRunner_resources', '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit', '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', @@ -111,13 +112,77 @@ ], }, { + 'target_name': 'TestRunner_resources', + 'type': 'none', + 'dependencies': [ + 'ImageDiff', + 'copy_TestNetscapePlugIn', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + 'LayoutTestHelper', + ], + 'copies': [{ + 'destination': '<(PRODUCT_DIR)', + 'files': ['<(ahem_path)'], + }], + }], + ['OS=="mac"', { + 'dependencies': [ + 'LayoutTestHelper', + ], + 'mac_bundle_resources': [ + '<(ahem_path)', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf', + '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', + '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', + ], + }], + ['use_x11 == 1', { + 'copies': [{ + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(ahem_path)', + '<(tools_dir)/DumpRenderTree/chromium/fonts.conf', + ] + }], + }], + ['OS=="android"', { + 'dependencies!': [ + 'ImageDiff', + 'copy_TestNetscapePlugIn', + ], + 'copies': [{ + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(ahem_path)', + '<(tools_dir)/DumpRenderTree/chromium/android_main_fonts.xml', + '<(tools_dir)/DumpRenderTree/chromium/android_fallback_fonts.xml', + ] + }], + }], + ['OS=="android" and android_build_type==0', { + 'dependencies': [ + 'ImageDiff#host', + ], + }], + ], + }, + { 'target_name': 'DumpRenderTree', 'type': 'executable', 'mac_bundle': 1, 'dependencies': [ - 'ImageDiff', 'TestRunner', - 'copy_TestNetscapePlugIn', '<(source_dir)/WebKit/chromium/WebKit.gyp:inspector_resources', '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit', '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf', @@ -126,7 +191,6 @@ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc', '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa', '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', - '<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', ], 'include_dirs': [ @@ -153,7 +217,6 @@ }], ['OS=="win"', { 'dependencies': [ - 'LayoutTestHelper', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:libEGL', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:libGLESv2', ], @@ -177,10 +240,6 @@ }, }], ], - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': ['<(ahem_path)'], - }], },{ # OS!="win" 'sources/': [ ['exclude', 'Win\\.cpp$'], @@ -212,21 +271,6 @@ ['OS=="mac"', { 'dependencies': [ '<(source_dir)/WebKit/chromium/WebKit.gyp:copy_mesa', - 'LayoutTestHelper', - ], - 'mac_bundle_resources': [ - '<(ahem_path)', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf', - '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', - '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', ], },{ # OS!="mac" 'sources/': [ @@ -246,8 +290,6 @@ 'copies': [{ 'destination': '<(PRODUCT_DIR)', 'files': [ - '<(ahem_path)', - '<(tools_dir)/DumpRenderTree/chromium/fonts.conf', '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak', ] }], @@ -286,17 +328,9 @@ '<(chromium_src_dir)/tools/android/forwarder/forwarder.gyp:forwarder', '<(chromium_src_dir)/tools/android/md5sum/md5sum.gyp:md5sum', ], - 'dependencies!': [ - 'ImageDiff', - 'copy_TestNetscapePlugIn', - '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa', - ], 'copies': [{ 'destination': '<(PRODUCT_DIR)', 'files': [ - '<(ahem_path)', - '<(tools_dir)/DumpRenderTree/chromium/android_main_fonts.xml', - '<(tools_dir)/DumpRenderTree/chromium/android_fallback_fonts.xml', '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak', ] }], @@ -305,11 +339,6 @@ ['exclude', 'Android\\.cpp$'], ], }], - ['OS=="android" and android_build_type==0', { - 'dependencies': [ - 'ImageDiff#host', - ], - }], ['inside_chromium_build==1 and component=="shared_library"', { 'sources': [ '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp', |