Remove webkit.gyp:pull_in_test_shell

webkit/tools/test_shell/test_shell.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
-    'chromium_code': 1,
     'test_shell_windows_resource_files': [
       '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',
     ],
   },
   'targets': [
     {
       'target_name': 'test_shell_common',
       'type': '<(library)',
+      'variables': {
+        'chromium_code': 1,
+      },
       'dependencies': [
-        '../../../app/app.gyp:app_base',
-        '../../../base/base.gyp:base',
-        '../../../base/base.gyp:base_i18n',
-        '../../../media/media.gyp:media',
-        '../../../net/net.gyp:net',
-        '../../../skia/skia.gyp:skia',
-        '../../../testing/gmock.gyp:gmock',
-        '../../../testing/gtest.gyp:gtest',
-        '../../../third_party/npapi/npapi.gyp:npapi',
-        '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../../webkit.gyp:appcache',
-        '../../webkit.gyp:database',
-        '../../webkit.gyp:glue',
-        '../../webkit.gyp:inspector_resources',
+        '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/testing/gmock.gyp:gmock',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        '<(DEPTH)/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+        '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/webkit/webkit.gyp:appcache',
+        '<(DEPTH)/webkit/webkit.gyp:database',
+        '<(DEPTH)/webkit/webkit.gyp:glue',
+        '<(DEPTH)/webkit/webkit.gyp:inspector_resources',
         'npapi_layout_test_plugin',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
       'sources': [
         'mac/DumpRenderTreePasteboard.h',
         'mac/DumpRenderTreePasteboard.m',
         'mac/test_shell_webview.h',
         'mac/test_shell_webview.mm',
         'mac/test_webview_delegate.mm',
         'mac/webview_host.mm',
@@ skipping 62 matching lines @@
         'text_input_controller.cc',
         'text_input_controller.h',
         'webview_host.h',
         'webview_host_gtk.cc',
         'webview_host_win.cc',
         'webwidget_host.h',
         'webwidget_host_gtk.cc',
         'webwidget_host_win.cc',
       ],
       'export_dependent_settings': [
-        '../../../base/base.gyp:base',
-        '../../../net/net.gyp:net',
-        '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../../webkit.gyp:glue',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+        '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/webkit/webkit.gyp:glue',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
         ['target_arch!="x64" and target_arch!="arm"', {
           'dependencies': [
             'npapi_test_plugin',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             'test_shell_resources',
-            '../../../build/linux/system.gyp:gtk',
-            '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+            '<(DEPTH)/build/linux/system.gyp:gtk',
+            '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           # for:  test_shell_gtk.cc
           'cflags': ['-Wno-multichar'],
-        }, { # else: OS!=linux
-          'sources/': [
-            ['exclude', '_gtk\\.cc$'],
-            ['exclude', '_x11\\.cc$'],
-          ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           # See below TODO in the Windows branch.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/plugins',
               'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
             },
           ],
         }],
-        ['OS!="mac"', {
-          'sources/': [
-            ['exclude', 'mac/[^/]*\\.(cc|mm?)$'],
-            ['exclude', '_mac\\.(cc|mm?)$'],
-          ]
-        }],
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],
           'link_settings': {
             'libraries': [
               '-lcomctl32.lib',
             ],
           },
           'include_dirs': [
             '../../../chrome/third_party/wtl/include',
             '.',
           ],
           'dependencies': [
-            '../../../breakpad/breakpad.gyp:breakpad_handler',
-            '../../default_plugin/default_plugin.gyp:default_plugin',
+            '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
+            '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin',
           ],
           # TODO(bradnelson):
           # This should really be done in the 'npapi_layout_test_plugin'
           # target, but the current VS generator handles 'copies'
           # settings as AdditionalDependencies, which means that
           # when it's over there, it tries to do the copy *before*
           # the file is built, instead of after.  We work around this
           # by attaching the copy here, since it depends on that
           # target.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/plugins',
               'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
             },
           ],
         }, {  # else: OS!=win
           'sources/': [
-            ['exclude', '_win\\.cc$'],
             ['exclude', '_webtheme(control|engine)\.(cc|h)$'],
           ],
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
           ],
         }],
       ],
     },
     {
@@ skipping 31 matching lines @@
               'destination': '<(PRODUCT_DIR)',
               'files': ['<(pak_path)'],
             },
           ],
         }],
       ],
     },
     {
       'target_name': 'test_shell',
       'type': 'executable',
+      'variables': {
+        'chromium_code': 1,
+      },
       'mac_bundle': 1,
       'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
       'dependencies': [
         'test_shell_common',
-        '../../../tools/imagediff/image_diff.gyp:image_diff',
+        '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff',
       ],
       'defines': [
         # Technically not a unit test but require functions available only to
         # unit tests.
         'UNIT_TEST'
       ],
       'sources': [
         'test_shell_main.cc',
       ],
       'mac_bundle_resources': [
         '../../data/test_shell/',
         'mac/English.lproj/InfoPlist.strings',
         'mac/English.lproj/MainMenu.nib',
         'mac/Info.plist',
         'mac/test_shell.icns',
         'resources/AHEM____.TTF',
       ],
       'mac_bundle_resources!': [
         # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
         # that automatically sets the correct INFOPLIST_FILE setting and adds
         # the file to a source group.
         'mac/Info.plist',
       ],
       'xcode_settings': {
-        'INFOPLIST_FILE': 'mac/Info.plist',
+        'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/test_shell/mac/Info.plist',
       },
       'conditions': [
         ['OS=="win"', {
-          'dependencies': ['layout_test_helper'],
+          'dependencies': [
+            'layout_test_helper',
+          ],
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [
             '<@(test_shell_windows_resource_files)',
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
-                '../../../base/allocator/allocator.gyp:allocator',
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
           'dependencies': [
-            '../../../build/linux/system.gyp:gtk',
+            '<(DEPTH)/build/linux/system.gyp:gtk',
             'test_shell_resources',
             'test_shell_pak',
           ],
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
-          'dependencies': ['layout_test_helper'],
+          'dependencies': [
+            'layout_test_helper',
+          ],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },
           'actions': [
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded en-US.
               'action_name': 'repack_locale',
               'variables': {
                 'pak_inputs': [
@@ skipping 24 matching lines @@
             # ffmpeg.gyp so they don't diverge. (BUG=23602)
             {
               'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
               'files': [
                 '<(PRODUCT_DIR)/libffmpegsumo.dylib',
               ],
             },
           ],
         }, { # OS != "mac"
           'dependencies': [
-            '../../../net/net.gyp:net_resources',
-            '../../webkit.gyp:webkit_resources',
-            '../../webkit.gyp:webkit_strings',
+            '<(DEPTH)/net/net.gyp:net_resources',
+            '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
+            '<(DEPTH)/webkit/webkit.gyp:webkit_strings',
           ]
         }],
       ],
     },
     {
       'target_name': 'test_shell_tests',
       'type': 'executable',
+      'variables': {
+        'chromium_code': 1,
+      },
       'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867',
       'dependencies': [
         'test_shell_common',
-        '../../../skia/skia.gyp:skia',
-        '../../../testing/gmock.gyp:gmock',
-        '../../../testing/gtest.gyp:gtest',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/testing/gmock.gyp:gmock',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
         '../../../skia/ext/convolver_unittest.cc',
         '../../../skia/ext/image_operations_unittest.cc',
         '../../../skia/ext/platform_canvas_unittest.cc',
         '../../../skia/ext/vector_canvas_unittest.cc',
         '../../appcache/manifest_parser_unittest.cc',
         '../../appcache/appcache_unittest.cc',
         '../../appcache/appcache_database_unittest.cc',
         '../../appcache/appcache_group_unittest.cc',
@@ skipping 54 matching lines @@
       'conditions': [
         ['OS=="win"', {
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [ '<@(test_shell_windows_resource_files)' ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             'test_shell_pak',
-            '../../../build/linux/system.gyp:gtk',
+            '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'sources!': [
              # TODO(port)
             '../../../skia/ext/platform_canvas_unittest.cc',
           ],
         }],
         ['OS=="mac"', {
           # mac tests load the resources from the built test_shell beside the
           # test
-          'dependencies': ['test_shell'],
+          'dependencies': [
+            'test_shell',
+           ],
           'sources!': [
             # Disable the image decoder tests because we use CoreGraphics
             # code on mac and these tests are for the Skia image-decoders.
             '../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
             '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
             '../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
             'image_decoder_unittest.cc',
             'image_decoder_unittest.h',
           ],
           'sources': [
             '../../../skia/ext/skia_utils_mac_unittest.mm',
           ],
         }],
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # else: OS!=win
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
           ],
         }],
         ['OS=="linux" or OS=="freebsd"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
-                '../../../base/allocator/allocator.gyp:allocator',
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
     {
       'target_name': 'npapi_layout_test_plugin',
       'type': 'loadable_module',
+      'variables': {
+        'chromium_code': 1,
+      },
       'mac_bundle': 1,
       'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
       'sources': [
         '../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': [
         '../../..',
       ],
       'dependencies': [
-        '../../../third_party/npapi/npapi.gyp:npapi',
-        '../../../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        '<(DEPTH)/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
       ],
       'msvs_disabled_warnings': [ 4996 ],
       'mac_bundle_resources': [
         '../npapi_layout_test_plugin/Info.r',
       ],
       'xcode_settings': {
-        'INFOPLIST_FILE': '../npapi_layout_test_plugin/Info.plist',
+        'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_layout_test_plugin/Info.plist',
       },
       'conditions': [
         ['OS!="win"', {
           'sources!': [
             '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
             '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
           ],
         # TODO(bradnelson):
         # This copy should really live here, as a post-build step,
         # but it's currently being implemented via
         # AdditionalDependencies, which tries to do the copy before
         # the file is built...
         #
         }, { # OS == "win"
         #  # The old VS build would explicitly copy the .dll into the
         #  # plugins subdirectory like this.  It might be possible to
         #  # use the 'product_dir' setting to build directly into
         #  # plugins/ (as is done on Linux), but we'd need to verify
         #  # that nothing breaks first.
         #  'copies': [
         #    {
         #      'destination': '<(PRODUCT_DIR)/plugins',
         #      'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
         #    },
         #  ],
+          'variables': {
+            # This is not a relative pathname.  Avoid pathname relativization
+            # by sticking it in a variable that isn't recognized as one
+            # containing pathnames, and by using the >(late) form of variable
+            # expansion.
+            'winmm_lib': 'winmm.lib',
+          },
           'link_settings': {
             'libraries': [
-              "winmm.lib",
-             ],
+              '>(winmm_lib)',
+            ],
           },
         }],
         ['OS=="mac"', {
           'product_name': 'TestNetscapePlugIn',
           'product_extension': 'plugin',
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
             ],
           },
         }],
         ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm")', {
           # Shared libraries need -fPIC on x86-64
           'cflags': ['-fPIC']
         }],
       ],
     },
   ],
   'conditions': [
     ['target_arch!="x64" and target_arch!="arm"', {
       'targets': [
         {
           'target_name': 'npapi_test_plugin',
           'type': 'loadable_module',
+          'variables': {
+            'chromium_code': 1,
+          },
           'mac_bundle': 1,
           'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
           'dependencies': [
-            '../../../base/base.gyp:base',
-            '../../../third_party/icu/icu.gyp:icuuc',
-            '../../../third_party/npapi/npapi.gyp:npapi',
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+            '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
           ],
           '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',
@@ skipping 29 matching lines @@
             '../../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': [
             '../../..',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': '../../glue/plugins/test/Info.plist',
+            'INFOPLIST_FILE': '<(DEPTH)/webkit/glue/plugins/test/Info.plist',
           },
           'conditions': [
             ['OS!="win"', {
               'sources!': [
                 # TODO(port):  Port these.
                  # plugin_npobject_lifetime_test.cc has win32-isms
                 #   (HWND, CALLBACK).
                 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
                  # The window APIs are necessarily platform-specific.
                 '../../glue/plugins/test/plugin_window_size_test.cc',
@@ skipping 60 matching lines @@
         },
       ],
     }],
    ['OS=="win"', {
       'targets': [
         {
           # Helper application that disables ClearType during the
           # running of the layout tests
           'target_name': 'layout_test_helper',
           'type': 'executable',
+          'variables': {
+            'chromium_code': 1,
+          },
           'sources': [
             'win/layout_test_helper.cc',
           ],
         },
       ],
     }],
    ['OS=="mac"', {
       'targets': [
         {
           # Helper application that manages the color sync profile on mac
           # for the test shells run by the layout tests.
           'target_name': 'layout_test_helper',
           'type': 'executable',
+          'variables': {
+            'chromium_code': 1,
+          },
           'sources': [
             'mac/layout_test_helper.mm',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
         },
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: