[webkit-changes] [131613] trunk/Tools

Wed, 17 Oct 2012 09:53:46 -0700

Title: [131613] trunk/Tools
Revision
131613
Author
joc...@chromium.org
Date
2012-10-17 09:55:02 -0700 (Wed, 17 Oct 2012)

Log Message

[gyp] fix bundle resources for DumpRenderTree on mac
https://bugs.webkit.org/show_bug.cgi?id=99558

Reviewed by Adam Barth.

mac_bundle_resources doesn't propagate to targets that depend on it,
so I'm wrapping it in an all_dependent_settings block.

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (131612 => 131613)


--- trunk/Tools/ChangeLog	2012-10-17 16:38:59 UTC (rev 131612)
+++ trunk/Tools/ChangeLog	2012-10-17 16:55:02 UTC (rev 131613)
@@ -1,3 +1,15 @@
+2012-10-17  Jochen Eisinger  <joc...@chromium.org>
+
+        [gyp] fix bundle resources for DumpRenderTree on mac
+        https://bugs.webkit.org/show_bug.cgi?id=99558
+
+        Reviewed by Adam Barth.
+
+        mac_bundle_resources doesn't propagate to targets that depend on it,
+        so I'm wrapping it in an all_dependent_settings block.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2012-10-17  Harald Alvestrand  <h...@google.com>
 
         Add myself to the MediaStream watchlist

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (131612 => 131613)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2012-10-17 16:38:59 UTC (rev 131612)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2012-10-17 16:55:02 UTC (rev 131613)
@@ -132,20 +132,22 @@
                     'dependencies': [
                         'LayoutTestHelper',
                     ],
-                    'mac_bundle_resources': [
-                        '<(ahem_path)',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
-                        '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
-                        '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
-                        '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
-                    ],
+                    'all_dependent_settings': {
+                        'mac_bundle_resources': [
+                            '<(ahem_path)',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
+                            '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
+                            '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
+                            '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
+                        ],
+                    },
                 }],
                 ['use_x11 == 1', {
                     'copies': [{

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to