Changeset 63676 in webkit

Timestamp:

Jul 19, 2010 10:26:17 AM (14 years ago)

Author:

tony@chromium.org

Message:

2010-07-19 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] refactor npapi plugin copy step
​https://bugs.webkit.org/show_bug.cgi?id=42493

This is to avoid duplicate copy rules in the Linux make build.

• WebKit.gyp:
• DEPS: 52483:52869

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• DEPS (modified) (2 diffs)
• WebKit.gyp (modified) (4 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-19  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] refactor npapi plugin copy step
+        https://bugs.webkit.org/show_bug.cgi?id=42493
+
+        This is to avoid duplicate copy rules in the Linux make build.
+
+        * WebKit.gyp:
+        * DEPS: 52483:52869
+
 2010-07-19  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '52483',
+  'chromium_rev': '52869',
 }
 
@@ -90 +90 @@
   'media':
     Var('chromium_svn')+'/media@'+Var('chromium_rev'),
+  'printing':
+    Var('chromium_svn')+'/printing@'+Var('chromium_rev'),
   'third_party/angle':  # needed by the gpu process
     From('chromium_deps', 'src/third_party/angle'),

trunk/WebKit/chromium/WebKit.gyp

@@ -732 +732 @@
                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
                 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
                 '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib'
@@ -778 +778 @@
                         'destination': '<(PRODUCT_DIR)',
                         'files': ['<(ahem_path)'],
-                    }, {
-                        # 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.
-                        'destination': '<(PRODUCT_DIR)/plugins',
-                        'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
                     }],
                 },{ # OS!="win"
@@ -832 +822 @@
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                     ],
-                    'copies': [{
-                        'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/PlugIns/',
-                        'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
-                    }],
                 },{ # OS!="mac"
                     'sources/': [
@@ -850 +836 @@
                             '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
                         ]
-                    }, {
-                        'destination': '<(PRODUCT_DIR)/plugins',
-                        'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
                     }],
                 },{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"