Changeset 274201 in webkit for trunk/Source/JavaScriptCore/GLib.cmake

Timestamp:

Mar 9, 2021, 11:36:26 PM (4 years ago)

Author:

[email protected]

Message:

GLib JSC API headers should only include other GLib JSC API headers
​https://bugs.webkit.org/show_bug.cgi?id=222803

Reviewed by Michael Catanzaro.

.:

GTK and WPE both build the JavaScriptCore GLib API. However they diverged with their CMake
variable names for the directory containing jsc. Declare a single variable for that
directory, DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR, that is shared between GLib ports.

Remove the GLIB_API_DIR variant which will just be replaced with
${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc in the CMake code.

• Source/cmake/OptionsGTK.cmake:
• Source/cmake/OptionsWPE.cmake:

Source/JavaScriptCore:

A number of private GLib JSC headers are directly including private JavaScriptCore headers.
To get this to compile ${FORWARDING_HEADERS_DIR}/JavaScriptCore was added to the list of
includes in targets that needed the JSC headers. This is incorrect because they are being
distributed in different directories.

The private JSC headers being used were replaced with forward declarations. The source
files were then updated accordingly.

Also the include directories that contained the <jsc/Foo.h> headers were added to
JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES so they're properly propagated to dependants.

• API/glib/JSCClassPrivate.h:
• API/glib/JSCContext.cpp:
• API/glib/JSCContextPrivate.h:
• API/glib/JSCVirtualMachine.cpp:
• API/glib/JSCVirtualMachinePrivate.h:
• API/glib/JSCWrapperMap.cpp:
• GLib.cmake:
• PlatformGTK.cmake:

Source/WebKit:

Update the includes and include directories.

• PlatformGTK.cmake:
• PlatformWPE.cmake:
• WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
• WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:

Tools:

Update the includes and include directories.

• MiniBrowser/wpe/CMakeLists.txt:
• TestWebKitAPI/PlatformGTK.cmake:
• TestWebKitAPI/PlatformWPE.cmake:
• TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
• TestWebKitAPI/glib/PlatformGTK.cmake:
• TestWebKitAPI/glib/PlatformWPE.cmake:

File:

• trunk/Source/JavaScriptCore/GLib.cmake (modified) (3 diffs)

trunk/Source/JavaScriptCore/GLib.cmake

@@ -1 +1 @@
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc)
 
 list(APPEND JavaScriptCore_SOURCES
@@ -19 +19 @@
 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
-    "${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}"
+    "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc"
     "${JAVASCRIPTCORE_DIR}/API/glib"
 )
 
+list(APPEND JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
+    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
+    "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}"
+)
+
 set(JavaScriptCore_INSTALLED_HEADERS
-    ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCAutocleanups.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCClass.h
@@ -37 +42 @@
 )
 
-configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h)
+configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h)
 
 # These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.