[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

tkent at chromium.org tkent at chromium.org
Wed Dec 22 11:24:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f32022814617f814b5151341e57ba7a034abb92f
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 01:54:42 2010 +0000

    2010-07-21  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [DRT/Chromium] Copy the test plugin into DumpRenderTree.app/
            https://bugs.webkit.org/show_bug.cgi?id=42733
    
            This was dropped in plugin copy refactoring.
    
            * WebKit.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63874 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ba6de88..d85379d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-21  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Copy the test plugin into DumpRenderTree.app/
+        https://bugs.webkit.org/show_bug.cgi?id=42733
+
+        This was dropped in plugin copy refactoring.
+
+        * WebKit.gyp:
+
 2010-07-21  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 8abc159..66ef57e 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -823,6 +823,11 @@
                         '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                     ],
+                    # Workaround for http://code.google.com/p/gyp/issues/detail?id=160
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/PlugIns/',
+                        'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
+                    }],
                 },{ # OS!="mac"
                     'sources/': [
                         # .mm is already excluded by common.gypi

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list