[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[tony at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit c8997339400f9a33e3809efd9c4576bcbf088f96
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 23:35:54 2011 +0000

    2011-01-11  Tony Chang  <tony at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [chromium] copy test netscape plugin into TestNetscapePlugin
            https://bugs.webkit.org/show_bug.cgi?id=52232
    
            * WebKit.gyp: Make a copy of the TestNetscapePlugIn in
                TestNetscapePlugIn and WebKitTestNetscapePlugIn
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 2a00e12..c98f15b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-11  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [chromium] copy test netscape plugin into TestNetscapePlugin
+        https://bugs.webkit.org/show_bug.cgi?id=52232
+
+        * WebKit.gyp: Make a copy of the TestNetscapePlugIn in
+            TestNetscapePlugIn and WebKitTestNetscapePlugIn
+
 2011-01-11  Kenneth Russell  <kbr at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 7499a68..cd499eb 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -1036,10 +1036,7 @@
             '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_name': 'TestNetscapePlugIn',
                     'product_extension': 'plugin',
                     'link_settings': {
                         'libraries': [
@@ -1050,12 +1047,7 @@
                     },
                     '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': '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                        'INFOPLIST_FILE': '../../Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
                     },
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -1092,9 +1084,13 @@
                     }],
                 }],
                 ['OS=="mac"', {
+                    'dependencies': ['WebKitTestNetscapePlugIn'],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)/plugins/',
-                        'files': ['<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/'],
+                        'files': [
+                            '<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/',
+                            '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/',
+                        ],
                     }],
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -1135,6 +1131,41 @@
                         'files': ['<(PRODUCT_DIR)/osmesa.so'],
                     }],
                 },
+                {
+                    'target_name': 'WebKitTestNetscapePlugIn',
+                    'type': 'loadable_module',
+                    'sources': [ '<@(test_plugin_files)' ],
+                    'dependencies': [
+                        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+                    ],
+                    'include_dirs': [
+                        '<(chromium_src_dir)',
+                        '../../Tools/DumpRenderTree/TestNetscapePlugIn',
+                        '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+                    ],
+                    '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': '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                    },
+                },
             ],
         }],
     ], # conditions

-- 
WebKit Debian packaging