[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zmo at google.com
zmo at google.com
Wed Dec 22 14:24:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fc2c24fe6c640f2d0588b229280001a4bad283bb
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 00:54:39 2010 +0000
2010-10-07 Zhenyao Mo <zmo at google.com>
Reviewed by Tony Chang.
Copy mesa lib into DumpRenderTree bundle in Mac
https://bugs.webkit.org/show_bug.cgi?id=47385
* WebKit.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69365 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 2989044..d597a6b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-07 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Tony Chang.
+
+ Copy mesa lib into DumpRenderTree bundle in Mac
+ https://bugs.webkit.org/show_bug.cgi?id=47385
+
+ * WebKit.gyp:
+
2010-10-07 Daniel Cheng <dcheng at chromium.org>
Reviewed by Tony Chang.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 365dae8..3fae7e1 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -892,7 +892,7 @@
], # actions
}],
['OS=="mac"', {
- 'dependencies': ['LayoutTestHelper'],
+ 'dependencies': ['LayoutTestHelper', 'copy_mesa'],
'mac_bundle_resources': [
'<(ahem_path)',
@@ -966,6 +966,15 @@
],
},
},
+ {
+ 'target_name': 'copy_mesa',
+ 'type': 'none',
+ 'dependencies': ['<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa'],
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/MacOS/',
+ 'files': ['<(PRODUCT_DIR)/osmesa.so'],
+ }],
+ },
],
}],
], # conditions
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list