[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 15:21:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 03fd20e1352e11630f2695d23cbd028a25af7643
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 2 00:00:54 2010 +0000
2010-11-01 Tony Chang <tony at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ff509a9..9c0322b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01 Tony Chang <tony at 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 at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index f121c5f..4ade0a6 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -741,7 +741,6 @@
'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
}],
},
-
{
'target_name': 'webkit_unit_tests',
'type': 'executable',
@@ -826,6 +825,7 @@
'dependencies': [
'ImageDiff',
'inspector_resources',
+ 'TestNetscapePlugIn',
'webkit',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
@@ -881,9 +881,6 @@
'sources/': [
['exclude', 'Win\\.cpp$'],
],
- 'dependencies': [
- 'TestNetscapePlugIn',
- ],
'actions': [
{
'action_name': 'repack_locale',
@@ -972,6 +969,63 @@
}],
],
},
+ {
+ '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': [
['OS=="win"', {
@@ -980,54 +1034,6 @@
'type': 'executable',
'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"', {
'targets': [
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list