Changeset 80368 in webkit

Timestamp:

Mar 4, 2011 11:21:20 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Dimitri Glazkov.

JavaScriptCore GYP build should use a header map
​https://bugs.webkit.org/show_bug.cgi?id=55712

This patch moves the os-win32 files into their own variable so that we
can use a header map in the Apple Mac Xcode build. The problem is that
the header map searches the whole project rather than just the files
included in a given target. Another solution to this problem is to
make GYP smarter about filtering out what files are added to the
project file.

• JavaScriptCore.gypi:
• gyp/JavaScriptCore.gyp:

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        JavaScriptCore GYP build should use a header map
+        https://bugs.webkit.org/show_bug.cgi?id=55712
+
+        This patch moves the os-win32 files into their own variable so that we
+        can use a header map in the Apple Mac Xcode build.  The problem is that
+        the header map searches the whole project rather than just the files
+        included in a given target.  Another solution to this problem is to
+        make GYP smarter about filtering out what files are added to the
+        project file.
+
+        * JavaScriptCore.gypi:
+        * gyp/JavaScriptCore.gyp:
+
 2011-03-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.gypi

@@ -352 +352 @@
             'jit/SpecializedThunkJIT.h',
             'jit/ThunkGenerators.cpp',
-            'os-win32/WinMain.cpp',
-            'os-win32/inttypes.h',
-            'os-win32/stdbool.h',
-            'os-win32/stdint.h',
             'parser/ASTBuilder.h',
             'parser/JSParser.cpp',
@@ -659 +655 @@
             'yarr/YarrSyntaxChecker.h',
         ],
+        # These files are separate from javascriptcore_files so we can use a
+        # header map in the Apple Mac Xcode build.
+        'os_win32_files': [
+            'os-win32/WinMain.cpp',
+            'os-win32/inttypes.h',
+            'os-win32/stdbool.h',
+            'os-win32/stdint.h',
+        ],
         'minidom_files': [
             'API/tests/JSNode.c',

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -110 +110 @@
           'mac_bundle': 1,
           'xcode_settings': {
-            'USE_HEADERMAP': 'NO',
             # FIXME: Remove these overrides once JavaScriptCore.xcconfig is
             # used only by this project.
@@ -196 +195 @@
       },
       'default_configuration': 'Debug',
-      'conditions': [
-        ['OS=="mac"', {
-          'xcode_settings': {
-            'USE_HEADERMAP': 'NO',
-          }
-        }],
-      ],
     },
     {
@@ -224 +216 @@
       },
       'default_configuration': 'Debug',
-      'conditions': [
-        ['OS=="mac"', {
-          'xcode_settings': {
-            'USE_HEADERMAP': 'NO',
-          }
-        }],
-      ],
     },
     {
@@ -253 +238 @@
       },
       'default_configuration': 'Debug',
-      'conditions': [
-        ['OS=="mac"', {
-          'xcode_settings': {
-            'USE_HEADERMAP': 'NO',
-          }
-        }],
-      ],
     },
   ], # targets