Changeset 81695 in webkit

Timestamp:

Mar 22, 2011 2:07:18 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

WebCore GYP build should build without help from normal WebCore build
​https://bugs.webkit.org/show_bug.cgi?id=56860

Before this patch, the WebCore GYP build wasn't generating the derived
sources quite right because the ENABLE macros were not being
communicated to the "Derived Sources" target.

This patch also adds the "Copy Forwarding and ICU Headers" as well as
the "Streamline Inspector Source" steps, which are present in the
normal build. Unlike the normal build, these steps occur in a new
target, called "WebCore Support", which is less than aesthetically
beautiful. Hopefully we'll be able to move them into the WebCore
target proper in the future, but that will likely require some GYP
changes.

This patch probably could have been broken down into a couple smaller
patches, but that doesn't seem necessary.

• WebCore.gypi:
  • This file appears to no longer exist.
• gyp/WebCore.gyp:
• gyp/copy-forwarding-and-icu-headers.sh: Added.
• gyp/streamline-inspector-source.sh: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• gyp/WebCore.gyp (modified) (4 diffs)
• gyp/copy-forwarding-and-icu-headers.sh (added)
• gyp/streamline-inspector-source.sh (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        WebCore GYP build should build without help from normal WebCore build
+        https://bugs.webkit.org/show_bug.cgi?id=56860
+
+        Before this patch, the WebCore GYP build wasn't generating the derived
+        sources quite right because the ENABLE macros were not being
+        communicated to the "Derived Sources" target.
+
+        This patch also adds the "Copy Forwarding and ICU Headers" as well as
+        the "Streamline Inspector Source" steps, which are present in the
+        normal build.  Unlike the normal build, these steps occur in a new
+        target, called "WebCore Support", which is less than aesthetically
+        beautiful.  Hopefully we'll be able to move them into the WebCore
+        target proper in the future, but that will likely require some GYP
+        changes.
+
+        This patch probably could have been broken down into a couple smaller
+        patches, but that doesn't seem necessary.
+
+        * WebCore.gypi:
+            - This file appears to no longer exist.
+        * gyp/WebCore.gyp:
+        * gyp/copy-forwarding-and-icu-headers.sh: Added.
+        * gyp/streamline-inspector-source.sh: Added.
+
 2011-03-22  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -70 +70 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMHTMLFormElement.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMHTMLFrameElement.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMHTMLFrameElementPrivate.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMHTMLFrameSetElement.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMHTMLHRElement.h',

trunk/Source/WebCore/gyp/WebCore.gyp

@@ -136 +136 @@
       ],
       'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig',
+      'actions': [
+        {
+          'action_name': 'Copy Forwarding and ICU Headers',
+          'inputs': [],
+          'outputs': [],
+          'action': [
+            'sh', '<(project_dir)/gyp/copy-forwarding-and-icu-headers.sh'
+          ],
+        },
+        {
+          'action_name': 'Streamline Inspector Source',
+          'inputs': [],
+          'outputs': [],
+          'action': [
+            'sh', '<(project_dir)/gyp/streamline-inspector-source.sh'
+          ],
+        },
+      ],
       # FIXME: A number of these actions aren't supposed to run if "${ACTION}" = "installhdrs"
       'postbuilds': [
@@ -182 +200 @@
         'WebCoreExportFileGenerator',
       ],
+      'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig',
       'actions': [{
         'action_name': 'Generate Derived Sources',
@@ -215 +234 @@
         ],
         'action': [
-          'sh', 'generate-webcore-export-file-generator.sh',
+          'sh', '<(project_dir)/gyp/generate-webcore-export-file-generator.sh',
         ],
       }],
@@ -259 +278 @@
         '<@(export_file_generator_files)',
       ],
-    }
+      'conditions': [
+        ['OS=="mac"', {
+          'xcode_settings': {
+            # FIXME: Remove these overrides once WebCore.xcconfig is
+            # used only by this project.
+            'GCC_PREFIX_HEADER': '<(project_dir)/WebCorePrefix.h',
+            'INFOPLIST_FILE': '<(project_dir)/Info.plist',
+          },
+        }],
+      ],
+    },
   ], # targets
 }