Changeset 79974 in webkit

Timestamp:

Mar 1, 2011 12:14:29 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Teach JavaScriptCore GYP build about DEPTH
​https://bugs.webkit.org/show_bug.cgi?id=55425

In addition to teaching the JavaScriptCore GYP build about DEPTH, this
change overrides the GCC warning configuration to disable a warning
that's causing probems in Assertions.cpp. With that warning disabled,
JavaScriptCore builds again.

• gyp/JavaScriptCore.gyp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• gyp/JavaScriptCore.gyp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-01  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Teach JavaScriptCore GYP build about DEPTH
+        https://bugs.webkit.org/show_bug.cgi?id=55425
+
+        In addition to teaching the JavaScriptCore GYP build about DEPTH, this
+        change overrides the GCC warning configuration to disable a warning
+        that's causing probems in Assertions.cpp.  With that warning disabled,
+        JavaScriptCore builds again.
+
+        * gyp/JavaScriptCore.gyp:
+
 2011-02-28  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -3 +3 @@
     '../JavaScriptCore.gypi',
   ],
-  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+  'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/DebugRelease.xcconfig',
   'targets': [
     {
@@ -9 +9 @@
       'type': 'shared_library',
       'include_dirs': [
-        '../..', # Some paths in API include JavaScriptCore/
-        '..',
-        '../ForwardingHeaders',
-        '../API',
-        '../assembler',
-        '../collector/handles',
-        '../bytecode',
-        '../bytecompiler',
-        '../debugger',
-        '../icu',
-        '../interpreter',
-        '../jit',
-        '../parser',
-        '../profiler',
-        '../runtime',
-        '../wtf',
-        '../wtf/unicode',
+        '<(DEPTH)', # Some paths in API include JavaScriptCore/
+        '<(DEPTH)/JavaScriptCore',
+        '<(DEPTH)/JavaScriptCore/ForwardingHeaders',
+        '<(DEPTH)/JavaScriptCore/API',
+        '<(DEPTH)/JavaScriptCore/assembler',
+        '<(DEPTH)/JavaScriptCore/collector/handles',
+        '<(DEPTH)/JavaScriptCore/bytecode',
+        '<(DEPTH)/JavaScriptCore/bytecompiler',
+        '<(DEPTH)/JavaScriptCore/debugger',
+        '<(DEPTH)/JavaScriptCore/icu',
+        '<(DEPTH)/JavaScriptCore/interpreter',
+        '<(DEPTH)/JavaScriptCore/jit',
+        '<(DEPTH)/JavaScriptCore/parser',
+        '<(DEPTH)/JavaScriptCore/profiler',
+        '<(DEPTH)/JavaScriptCore/runtime',
+        '<(DEPTH)/JavaScriptCore/wtf',
+        '<(DEPTH)/JavaScriptCore/wtf/unicode',
         '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
       ],
@@ -36 +36 @@
         'libobjc.dylib',
       ],
-      'xcode_config_file': '../Configurations/JavaScriptCore.xcconfig',
+      'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/JavaScriptCore.xcconfig',
       'sources/': [
         ['exclude', 'qt'],
@@ -80 +80 @@
           'mac_bundle': 1,
           'xcode_settings': {
-            'USE_HEADERMAP': 'NO', # FIXME: Do we need this?
-          }
+            'USE_HEADERMAP': 'NO',
+            # FIXME: Remove these overrides once JavaScriptCore.xcconfig is
+            # used only by this project.
+            'GCC_PREFIX_HEADER': '<(DEPTH)/JavaScriptCore/JavaScriptCorePrefix.h',
+            'INFOPLIST_FILE': '<(DEPTH)/JavaScriptCore/Info.plist',
+            # This setting mirrors the setting in Base.xcconfig, with
+            # one difference noted below.
+            'WARNING_CFLAGS_BASE': [
+              '-Wall',
+              '-Wextra',
+              '-Wcast-qual',
+              '-Wchar-subscripts',
+              '-Wextra-tokens',
+              '-Wformat=2',
+              '-Winit-self',
+              # FIXME: For some reason, -Wmissing-format-attribute causes a
+              # build error in Assertions.cpp in the GYP build but not in the
+              # non-GYP build.
+              # '-Wmissing-format-attribute',
+              '-Wmissing-noreturn',
+              '-Wpacked',
+              '-Wpointer-arith',
+              '-Wredundant-decls',
+              '-Wundef',
+              '-Wwrite-strings',
+            ],
+          },
         }],
       ],