Title: [144966] trunk/Tools
Revision
144966
Author
t...@chromium.org
Date
2013-03-06 12:45:35 -0800 (Wed, 06 Mar 2013)

Log Message

[chromium] making DumpRenderTree_resources a separate bundle breaks xcode
https://bugs.webkit.org/show_bug.cgi?id=111509

Reviewed by Dirk Pranke.

Add DumpRenderTree.pak to DumpRenderTree.app again.

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (144965 => 144966)


--- trunk/Tools/ChangeLog	2013-03-06 20:42:32 UTC (rev 144965)
+++ trunk/Tools/ChangeLog	2013-03-06 20:45:35 UTC (rev 144966)
@@ -1,3 +1,14 @@
+2013-03-06  Tony Chang  <t...@chromium.org>
+
+        [chromium] making DumpRenderTree_resources a separate bundle breaks xcode
+        https://bugs.webkit.org/show_bug.cgi?id=111509
+
+        Reviewed by Dirk Pranke.
+
+        Add DumpRenderTree.pak to DumpRenderTree.app again.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2013-03-06  Jochen Eisinger  <joc...@chromium.org>
 
         [chromium] introduce WebUserGestureIndicator

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (144965 => 144966)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2013-03-06 20:42:32 UTC (rev 144965)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2013-03-06 20:45:35 UTC (rev 144966)
@@ -390,11 +390,16 @@
                     '<(PRODUCT_DIR)/DumpRenderTree.pak',
                 ],
                 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-                # FIXME: does this need to be enabled? If it is, xcode
-                # seems to break since DumpRenderTree_resources isn't actually
-                # a bundle.
-                # 'process_outputs_as_mac_bundle_resources': 1,
             }],
+            'conditions': [
+                ['OS=="mac"', {
+                    'all_dependent_settings': {
+                        'mac_bundle_resources': [
+                            '<(PRODUCT_DIR)/DumpRenderTree.pak',
+                        ],
+                    },
+                }],
+            ]
         },
         {
             'target_name': 'TestNetscapePlugIn',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to