Changeset 81539 in webkit

Timestamp:

Mar 18, 2011 5:48:10 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-18 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

WebCore GYP build should (almost!) link
​https://bugs.webkit.org/show_bug.cgi?id=56689

This patch is a grab-bag of small changes to bring the WebCore GYP
build down to two link errors or one compile error (take your pick).
We might need a GYP change to get this last file to compile, however.

• WebCore.gypi:
• gyp/WebCore.gyp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (4 diffs)
• gyp/WebCore.gyp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        WebCore GYP build should (almost!) link
+        https://bugs.webkit.org/show_bug.cgi?id=56689
+
+        This patch is a grab-bag of small changes to bring the WebCore GYP
+        build down to two link errors or one compile error (take your pick).
+        We might need a GYP change to get this last file to compile, however.
+
+        * WebCore.gypi:
+        * gyp/WebCore.gyp:
+
 2011-03-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -4760 +4760 @@
             'platform/mac/PurgeableBufferMac.cpp',
             'platform/mac/RuntimeApplicationChecks.mm',
+            'platform/mac/SSLKeyGeneratorMac.cpp',
             'platform/mac/SchedulePairMac.mm',
             'platform/mac/ScrollAnimatorMac.h',
@@ -6546 +6547 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/CharsetData.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/ColorData.cpp',
+            # This list does not contain all the Objective-C bindings files
+            # that we generate.  We run all the IDL files through the
+            # Objective-C code generator, but not all of them even build.
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMAbstractViewInternal.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMAbstractViewPrivate.h',
@@ -6766 +6770 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNode.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNode.mm',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNodeIterator.mm',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNodeIteratorInternal.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNodeList.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMNodeListInternal.h',
@@ -6777 +6783 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMProcessingInstruction.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMProcessingInstructionInternal.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMProgressEvent.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMRGBColor.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMRGBColorInternal.h',

trunk/Source/WebCore/gyp/WebCore.gyp

@@ -47 +47 @@
       ],
       'sources/': [
-        # This file fails to build because objc_finalizeOnMainThread is deprecated...
-        ['exclude', 'platform/mac/WebCoreObjCExtras.mm$'],
-
         ['exclude', 'bindings/[^/]+/'],
         ['include', 'bindings/generic/'],
@@ -60 +57 @@
         # FIXME: Figure out how to store these patterns in a variable.
         ['exclude', '(android|brew|cairo|chromium|curl|efl|freetype|fftw|gstreamer|gtk|haiku|linux|mkl|openvg|pango|qt|skia|soup|symbian|texmap|iphone|v8|win|wince|wx)/'],
-        ['exclude', '(Android|Brew|Cairo|Curl|Chromium|Efl|Haiku|Gtk|JSC|Linux|OpenType|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'],
+        ['exclude', '(Android|Brew|Cairo|Curl|Chromium|Efl|Haiku|Gtk|Linux|OpenType|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'],
         ['exclude', 'Chromium[^/]*\\.(cpp|mm?)$'],