Changeset 80131 in webkit

Timestamp:

Mar 2, 2011 8:01:41 AM (13 years ago)

Author:

abecsi@webkit.org

Message:

2011-03-02 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt][WK2] generate-forwarding-headers.pl should generate paths with framework names
​https://bugs.webkit.org/show_bug.cgi?id=55478

On case insensitive systems the generated forwarding headers cause build problems.

• Source/WebKit.pri: Adjust INCLUDEPATH for the project.

2011-03-02 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt][WK2] generate-forwarding-headers.pl should generate paths with framework names
​https://bugs.webkit.org/show_bug.cgi?id=55478

On case insensitive systems the generated forwarding headers cause build problems.

• Scripts/generate-forwarding-headers.pl: The generated header should also contain the framework name.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Scripts/generate-forwarding-headers.pl (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-03-02  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][WK2] generate-forwarding-headers.pl should generate paths with framework names
+        https://bugs.webkit.org/show_bug.cgi?id=55478
+
+        On case insensitive systems the generated forwarding headers cause build problems.
+
+        * Source/WebKit.pri: Adjust INCLUDEPATH for the project.
+
 2011-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit.pri

@@ -69 +69 @@
 
 INCLUDEPATH += \
+    $$PWD \
     $$OUTPUT_DIR/include/QtWebKit \
-    $$OUTPUT_DIR/include
-INCLUDEPATH += $$QT.script.includes
+    $$OUTPUT_DIR/include \
+    $$QT.script.includes
 
-webkit2 {
-    INCLUDEPATH += $$OUTPUT_DIR/include/WebKit2
-    # FIXME: Once the public header are well defined for WebKit2, this must go away.
-    INCLUDEPATH += $$PWD/WebKit2/
-}
+webkit2:INCLUDEPATH *= $$OUTPUT_DIR/include/WebKit2
 
 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-02  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][WK2] generate-forwarding-headers.pl should generate paths with framework names
+        https://bugs.webkit.org/show_bug.cgi?id=55478
+
+        On case insensitive systems the generated forwarding headers cause build problems.
+
+        * Scripts/generate-forwarding-headers.pl: The generated header should
+        also contain the framework name.
+
 2011-03-01  Jeff Miller  <jeffm@apple.com>
 

trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl

@@ -94 +94 @@
         if(grep($_ =~ "/$headerName\$", @frameworkHeaders) == 1 || $header =~ "/$platform/" ) {
             my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
-            my $expectedIncludeStatement = "#include \"$header\"";
+            my $expectedIncludeStatement = "#include \"$framework/$header\"";
             my $foundIncludeStatement = 0;