Changeset 71077 in webkit

Timestamp:

Nov 1, 2010 5:00:54 PM (13 years ago)

Author:

tony@chromium.org

Message:

2010-11-01 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] Compile TestNetscapePlugin on chromium win
​https://bugs.webkit.org/show_bug.cgi?id=48802

It creates npTestNetscapePlugin.dll in the build directory, so
it's not yet loaded by DRT or test_shell.

• WebKit.gyp:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (5 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-11-01  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] Compile TestNetscapePlugin on chromium win
+        https://bugs.webkit.org/show_bug.cgi?id=48802
+
+        It creates npTestNetscapePlugin.dll in the build directory, so
+        it's not yet loaded by DRT or test_shell.
+
+        * WebKit.gyp:
+
 2010-11-01  Brady Eidson  <beidson@apple.com>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -742 +742 @@
             }],
         },
-
         {
             'target_name': 'webkit_unit_tests',
@@ -827 +826 @@
                 'ImageDiff',
                 'inspector_resources',
+                'TestNetscapePlugIn',
                 'webkit',
                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
@@ -881 +881 @@
                     'sources/': [
                         ['exclude', 'Win\\.cpp$'],
-                    ],
-                    'dependencies': [
-                        'TestNetscapePlugIn',
                     ],
                     'actions': [
@@ -973 +970 @@
             ],
         },
+        {
+            'target_name': 'TestNetscapePlugIn',
+            'type': 'loadable_module',
+            'sources': [ '<@(test_plugin_files)' ],
+            'dependencies': [
+                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+            ],
+            'include_dirs': [
+                '<(chromium_src_dir)',
+                '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
+                '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+            ],
+            'conditions': [
+                ['OS=="mac"', {
+                    'mac_bundle': 1,
+                    # It would be nice to name this
+                    # TestNetscapePlugIn, but that name is already
+                    # used by the fork of this plugin in Chromium.
+                    'product_name': 'WebKitTestNetscapePlugIn',
+                    'product_extension': 'plugin',
+                    'link_settings': {
+                        'libraries': [
+                            '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                            '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+                            '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+                        ]
+                    },
+                    'xcode_settings': {
+                        'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
+                        # This is a temporary fork of
+                        # DRT/TestNetscapePlugIn/mac/Info.plist.  Once
+                        # we get rid of our forked plugin in the
+                        # chromium repo, we can share the same
+                        # Info.plist.
+                        'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                    },
+                }],
+                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                    'cflags': [
+                        '-fvisibility=default',
+                    ],
+                }],
+                ['OS=="win"', {
+                    'defines': [
+                        # This seems like a hack, but this is what Safari Win does.
+                        'snprintf=_snprintf',
+                    ],
+                    'sources': [
+                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
+                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
+                    ],
+                    # The .rc file requires that the name of the dll is npTestNetscapePlugin.dll.
+                    # This adds the 'np' to the dll name.
+                    'product_prefix': 'np',
+                }],
+            ],
+        },
     ], # targets
     'conditions': [
@@ -981 +1035 @@
                 'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
             }],
-        }, {  # OS!="win"
-            'targets': [
-                {
-                    'target_name': 'TestNetscapePlugIn',
-                    'type': 'loadable_module',
-                    'sources': [ '<@(test_plugin_files)' ],
-                    'dependencies': [
-                        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
-                    ],
-                    'include_dirs': [
-                        '<(chromium_src_dir)',
-                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
-                        '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
-                    ],
-
-                    'conditions': [
-                        ['OS=="mac"', {
-                            'mac_bundle': 1,
-                            # It would be nice to name this
-                            # TestNetscapePlugIn, but that name is already
-                            # used by the fork of this plugin in Chromium.
-                            'product_name': 'WebKitTestNetscapePlugIn',
-                            'product_extension': 'plugin',
-                            'link_settings': {
-                                'libraries': [
-                                    '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-                                    '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
-                                    '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-                                ]
-                            },
-                            'xcode_settings': {
-                                'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
-                                # This is a temporary fork of
-                                # DRT/TestNetscapePlugIn/mac/Info.plist.  Once
-                                # we get rid of our forked plugin in the
-                                # chromium repo, we can share the same
-                                # Info.plist.
-                                'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
-                            },
-                        }],
-                        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-                            'cflags': [
-                                '-fvisibility=default',
-                            ],
-                        }],
-                    ],
-                },
-            ],
         }],
         ['OS=="mac"', {