Attachment 84921 Details for Bug 55857 – Patch

[patch] Patch

bug-55857-20110306223623.patch (text/plain), 3.33 KB, created by Adam Barth on 2011-03-06 22:36:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2011-03-06 22:36:24 PST

Size: 3.33 KB

patch

obsolete

>Subversion Revision: 80393
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fcefe7e807135b4a078ea21e8a4b70bb0c08917b..26f3b037b05ae619aecd657cc021dbf915b13bc9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2011-03-06  Adam Barth  <abarth@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Filter sources in WebCore GYP build for Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=55857
>+
>+        This patch removes a large number of files that do not build as part of
>+        the Mac build.  I'm not fully sold on this method of
>+        including/excluding files, but it's the "gyp way" so we should probably
>+        try it first.
>+
>+        After this patch, the majority of our build errors arise from Xcode's
>+        header map picking the wrong copy of a header file that exists in
>+        multiple locations with the same name, which isn't helped by excluding
>+        those header files in this way.
>+
>+        * gyp/WebCore.gyp:
>+
> 2011-03-04  Adam Barth  <abarth@webkit.org>
> 
>         Reviewed by NOBODY (OOPS!).
>diff --git a/Source/WebCore/gyp/WebCore.gyp b/Source/WebCore/gyp/WebCore.gyp
>index ae75c05c2afda28cee3186f9c450d6460f197f50..8931c631ee854ba5f7a88419a4d2217addce78d1 100644
>--- a/Source/WebCore/gyp/WebCore.gyp
>+++ b/Source/WebCore/gyp/WebCore.gyp
>@@ -41,6 +41,48 @@
>         'libxml2.dylib',
>         'libz.dylib',
>       ],
>+      'sources/': [
>+        ['exclude', 'bindings/cpp/'],
>+        ['exclude', 'bindings/gobject/'],
>+        ['exclude', 'bindings/v8/'],
>+        ['exclude', 'bridge/jni/v8/'],
>+        ['exclude', 'bridge/qt/'],
>+        ['exclude', 'platform/[^/]+/'],
>+        ['include', 'platform/audio/'],
>+        ['exclude', 'platform/audio/[^/]+/'],
>+        ['include', 'platform/audio/mac/'],
>+        ['include', 'platform/audio/fftw/'], # FIXME: Is this correct? mkl is the other choice.
>+        ['include', 'platform/audio/resources/'],
>+        ['include', 'platform/cocoa/'],
>+        ['include', 'platform/graphics/'],
>+        ['exclude', 'platform/graphics/[^/]+/'],
>+        ['include', 'platform/graphics/ca/'],
>+        ['include', 'platform/graphics/cg/'],
>+        ['include', 'platform/graphics/cocoa/'],
>+        ['include', 'platform/graphics/filters/'],
>+        ['include', 'platform/graphics/gpu/'],
>+        ['include', 'platform/graphics/mac/'],
>+        ['include', 'platform/graphics/opengl/'],
>+        ['include', 'platform/graphics/transforms/'],
>+        ['include', 'platform/mac/'],
>+        ['include', 'platform/mock/'],
>+        ['include', 'platform/network/'],
>+        ['exclude', 'platform/network/[^/]+/'],
>+        ['include', 'platform/network/cf'],
>+        ['include', 'platform/network/mac'],
>+        ['include', 'platform/posix/'],
>+        ['include', 'platform/sql/'],
>+        ['exclude', 'platform/sql/chromium'],
>+        ['include', 'platform/text/'],
>+        ['exclude', 'platform/text/[^/]+/'],
>+        ['include', 'platform/text/cf'],
>+        ['include', 'platform/text/mac'],
>+        ['include', 'platform/text/transcoder'],
>+        ['exclude', 'DerivedSources\.cpp$'],
>+        # FIXME: Consider using one or more AllInOne files.
>+        ['exclude', 'AllInOne\.cpp$'],
>+        ['exclude', 'WebCore\.gyp/mac/Empty\.cpp$']
>+      ],
>       'mac_framework_headers': [
>         '<@(webcore_publicheader_files)',
>       ],

Actions: View | Formatted Diff | Diff

Attachments on bug 55857: 84921 | 84926