[webkit-changes] [195155] trunk/Source

Fri, 15 Jan 2016 15:42:28 -0800

Title: [195155] trunk/Source
Revision
195155
Author
achristen...@apple.com
Date
2016-01-15 15:42:04 -0800 (Fri, 15 Jan 2016)

Log Message

Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=153142

Source/_javascript_Core:

Reviewed by Brent Fulgham.

The internal Windows build builds _javascript_Core from a directory that is not called _javascript_Core.
Searching for _javascript_Core/API/APICast.h fails because it is in SomethingElse/API/APICast.h.
Since we are including the _javascript_Core directory, it is not necessary to have _javascript_Core in
the forwarding headers, but removing it allows builds form directories that are not named _javascript_Core.

* ForwardingHeaders/_javascript_Core/APICast.h:
* ForwardingHeaders/_javascript_Core/JSBase.h:
* ForwardingHeaders/_javascript_Core/JSCTestRunnerUtils.h:
* ForwardingHeaders/_javascript_Core/JSContextRef.h:
* ForwardingHeaders/_javascript_Core/JSObjectRef.h:
* ForwardingHeaders/_javascript_Core/JSRetainPtr.h:
* ForwardingHeaders/_javascript_Core/JSStringRef.h:
* ForwardingHeaders/_javascript_Core/JSStringRefCF.h:
* ForwardingHeaders/_javascript_Core/JSValueRef.h:
* ForwardingHeaders/_javascript_Core/_javascript_.h:
* ForwardingHeaders/_javascript_Core/_javascript_Core.h:
* ForwardingHeaders/_javascript_Core/OpaqueJSString.h:
* ForwardingHeaders/_javascript_Core/WebKitAvailability.h:

Source/WebKit2:

Unreviewed addition to Alex's JSC patch, which was reviewed by Brent Fulgham. Pass
-I${_javascript_CORE_DIR} to g-ir-scanner.

Patch by Michael Catanzaro <mcatanz...@igalia.com> on 2016-01-15

* PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (195154 => 195155)


--- trunk/Source/_javascript_Core/ChangeLog	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1,3 +1,29 @@
+2016-01-15  Alex Christensen  <achristen...@webkit.org>
+
+        Fix internal Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=153142
+
+        Reviewed by Brent Fulgham.
+
+        The internal Windows build builds _javascript_Core from a directory that is not called _javascript_Core.
+        Searching for _javascript_Core/API/APICast.h fails because it is in SomethingElse/API/APICast.h.
+        Since we are including the _javascript_Core directory, it is not necessary to have _javascript_Core in
+        the forwarding headers, but removing it allows builds form directories that are not named _javascript_Core.
+
+        * ForwardingHeaders/_javascript_Core/APICast.h:
+        * ForwardingHeaders/_javascript_Core/JSBase.h:
+        * ForwardingHeaders/_javascript_Core/JSCTestRunnerUtils.h:
+        * ForwardingHeaders/_javascript_Core/JSContextRef.h:
+        * ForwardingHeaders/_javascript_Core/JSObjectRef.h:
+        * ForwardingHeaders/_javascript_Core/JSRetainPtr.h:
+        * ForwardingHeaders/_javascript_Core/JSStringRef.h:
+        * ForwardingHeaders/_javascript_Core/JSStringRefCF.h:
+        * ForwardingHeaders/_javascript_Core/JSValueRef.h:
+        * ForwardingHeaders/_javascript_Core/_javascript_.h:
+        * ForwardingHeaders/_javascript_Core/_javascript_Core.h:
+        * ForwardingHeaders/_javascript_Core/OpaqueJSString.h:
+        * ForwardingHeaders/_javascript_Core/WebKitAvailability.h:
+
 2016-01-15  Per Arne Vollan  <pe...@outlook.com>
 
         [B3][Win64] Compile fixes.

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/APICast.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/APICast.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/APICast.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/APICast.h>
+#include <API/APICast.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSBase.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSBase.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSBase.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSBase.h>
+#include <API/JSBase.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSCTestRunnerUtils.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSCTestRunnerUtils.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSCTestRunnerUtils.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSCTestRunnerUtils.h>
+#include <API/JSCTestRunnerUtils.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSContextRef.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSContextRef.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSContextRef.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSContextRef.h>
+#include <API/JSContextRef.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSObjectRef.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSObjectRef.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSObjectRef.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSObjectRef.h>
+#include <API/JSObjectRef.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSRetainPtr.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSRetainPtr.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSRetainPtr.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSRetainPtr.h>
+#include <API/JSRetainPtr.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRef.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRef.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRef.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSStringRef.h>
+#include <API/JSStringRef.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRefCF.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRefCF.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSStringRefCF.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSStringRefCF.h>
+#include <API/JSStringRefCF.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSValueRef.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSValueRef.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/JSValueRef.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/JSValueRef.h>
+#include <API/JSValueRef.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/_javascript_.h>
+#include <API/_javascript_.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_Core.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_Core.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/_javascript_Core.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/_javascript_Core.h>
+#include <API/_javascript_Core.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/OpaqueJSString.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/OpaqueJSString.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/OpaqueJSString.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/OpaqueJSString.h>
+#include <API/OpaqueJSString.h>

Modified: trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/WebKitAvailability.h (195154 => 195155)


--- trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/WebKitAvailability.h	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/_javascript_Core/ForwardingHeaders/_javascript_Core/WebKitAvailability.h	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1 +1 @@
-#include <_javascript_Core/API/WebKitAvailability.h>
+#include <API/WebKitAvailability.h>

Modified: trunk/Source/WebKit2/ChangeLog (195154 => 195155)


--- trunk/Source/WebKit2/ChangeLog	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/WebKit2/ChangeLog	2016-01-15 23:42:04 UTC (rev 195155)
@@ -1,3 +1,13 @@
+2016-01-15  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        Fix internal Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=153142
+
+        Unreviewed addition to Alex's JSC patch, which was reviewed by Brent Fulgham. Pass
+        -I${_javascript_CORE_DIR} to g-ir-scanner.
+
+        * PlatformGTK.cmake:
+
 2016-01-14  Simon Fraser  <simon.fra...@apple.com>
 
         Remove workaround for rdar://problem/23623670

Modified: trunk/Source/WebKit2/PlatformGTK.cmake (195154 => 195155)


--- trunk/Source/WebKit2/PlatformGTK.cmake	2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/WebKit2/PlatformGTK.cmake	2016-01-15 23:42:04 UTC (rev 195155)
@@ -929,6 +929,7 @@
         -DWEBKIT2_COMPILATION
         -I${CMAKE_SOURCE_DIR}/Source
         -I${WEBKIT2_DIR}
+        -I${_javascript_CORE_DIR}
         -I${_javascript_CORE_DIR}/ForwardingHeaders
         -I${DERIVED_SOURCES_DIR}
         -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
@@ -977,6 +978,7 @@
         -DWEBKIT2_COMPILATION
         -I${CMAKE_SOURCE_DIR}/Source
         -I${WEBKIT2_DIR}
+        -I${_javascript_CORE_DIR}
         -I${_javascript_CORE_DIR}/ForwardingHeaders
         -I${DERIVED_SOURCES_DIR}
         -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to