Changeset 81759 in webkit

Timestamp:

Mar 23, 2011 3:17:22 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

JavaScriptCore GYP build should work on a case-sensitive file system
​https://bugs.webkit.org/show_bug.cgi?id=56911

The issue is that there are two UString.h headers, one named UString.h
and one named ustring.h. This patch excludes ustring.h from the header
map to avoid confusion. While I was editing this part of the GYP file,
I cleaned up the exclude rules to be more modern.

• gyp/JavaScriptCore.gyp:

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-23  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        JavaScriptCore GYP build should work on a case-sensitive file system
+        https://bugs.webkit.org/show_bug.cgi?id=56911
+
+        The issue is that there are two UString.h headers, one named UString.h
+        and one named ustring.h.  This patch excludes ustring.h from the header
+        map to avoid confusion.  While I was editing this part of the GYP file,
+        I cleaned up the exclude rules to be more modern.
+
+        * gyp/JavaScriptCore.gyp:
+
 2011-03-22  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -76 +76 @@
       'xcode_config_file': '<(project_dir)/Configurations/JavaScriptCore.xcconfig',
       'sources/': [
-        ['exclude', 'qt'],
-        ['exclude', 'os-win32'],
-        ['exclude', 'wtf/android'],
-        ['exclude', 'wtf/brew'],
-        ['exclude', 'wtf/efl'],
-        ['exclude', 'wtf/gtk'],
-        ['exclude', 'wtf/qt'],
-        ['exclude', 'wtf/haiku'],
-        ['exclude', 'API/tests'],
-        ['exclude', 'wtf/url'],
-        ['exclude', 'wtf/wince'],
-        ['exclude', 'wtf/wx'],
-        ['exclude', 'wtf/unicode/brew'],
-        ['exclude', 'wtf/unicode/wince'],
-        ['exclude', 'wtf/unicode/glib'],
-        ['exclude', 'wtf/unicode/qt4'],
+        ['exclude', 'API/tests/'],
+        ['exclude', 'ForwardingHeaders/'],
+        ['exclude', '(?<!unicode)/icu/'],
+        ['exclude', 'os-win32/'],
+        ['exclude', 'qt/'],
+        ['exclude', 'wtf/(android|brew|efl|gtk|haiku|qt|wince|wx)/'],
+        ['exclude', 'wtf/unicode/brew/'],
+        ['exclude', 'wtf/unicode/glib/'],
+        ['exclude', 'wtf/unicode/qt4/'],
+        ['exclude', 'wtf/unicode/wince/'],
+        ['exclude', 'wtf/url/'],
         ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
         ['exclude', '(Default|Gtk|Chromium|None|Qt|Win|Wx|Symbian)\\.(cpp|mm|h)$'],
-        ['exclude', 'GCActivityCallback\.cpp'],
-        ['exclude', '.*BSTR.*$'],
+        ['exclude', 'GCActivityCallback\.cpp$'],
+        ['exclude', 'BSTR[^/]*$'],
       ],
       'postbuilds': [