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

Timestamp:

Mar 3, 2021, 8:02:09 AM (4 years ago)

Author:

[email protected]

Message:

[CMake] JavaScriptCore GLib headers should be copies
​https://bugs.webkit.org/show_bug.cgi?id=222625

Reviewed by Michael Catanzaro.

.:

Specify the directories for JavaScriptCore GLib headers and derived sources.

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

Source/JavaScriptCore:

Copy the headers rather than creating a symbolic link to structure the JavaScriptCore Glib
headers into a jsc directory. This follows the convention used in JavaScriptCore where
there are public and private headers.

The public JavaScriptCore GLib headers are copied before building JavaScriptCore. The
private JavaScriptCore were modified to include the public GLib headers through
<jsc/Header.h> rather than "Header.h" which is convention for the private C APIs in
JavaScriptCore.

APICast.h was being erroneously included in JSCClassPrivate.h because its not a
JavaScriptCore GLib header. Instead forward declarations were added to the private headers
and APICast.h was used as necessary in the .cpp files.

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

Source/WebKit:

Update the includes for the GLib ports.

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

Tools:

Update the includes for the GLib ports.

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

File:

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

trunk/Source/JavaScriptCore/GLib.cmake

@@ -1 @@
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR})
-
 list(APPEND JavaScriptCore_SOURCES
     API/glib/JSAPIWrapperGlobalObject.cpp
@@ -17 +14 @@
 )
 
+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+    "${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}"
+)
+
 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
-    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
-    "${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}"
+    "${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}"
     "${JAVASCRIPTCORE_DIR}/API/glib"
 )
 
+configure_file(API/glib/JSCVersion.h.in ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h)
+
+set(JavaScriptCoreGLib_FRAMEWORK_HEADERS
+    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
+
+    API/glib/JSCAutocleanups.h
+    API/glib/JSCClass.h
+    API/glib/JSCContext.h
+    API/glib/JSCDefines.h
+    API/glib/JSCException.h
+    API/glib/JSCOptions.h
+    API/glib/JSCValue.h
+    API/glib/JSCVirtualMachine.h
+    API/glib/JSCWeakValue.h
+    API/glib/jsc.h
+)
+
+WEBKIT_COPY_FILES(JavaScriptCoreGLib_CopyHeaders
+    DESTINATION ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
+    FILES ${JavaScriptCoreGLib_FRAMEWORK_HEADERS}
+    FLATTENED
+)
+list(APPEND JavaScriptCore_DEPENDENCIES JavaScriptCoreGLib_CopyHeaders)
+
+set(JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS
+    API/glib/JSCContextPrivate.h
+    API/glib/JSCValuePrivate.h
+)
+WEBKIT_COPY_FILES(JavaScriptCoreGLib_CopyPrivateHeaders
+    DESTINATION ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}/jsc
+    FILES ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS}
+    FLATTENED
+)
+
+list(APPEND JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
+    ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
+    ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
+)
+list(APPEND JavaScriptCore_INTERFACE_DEPENDENCIES
+    JavaScriptCoreGLib_CopyHeaders
+    JavaScriptCoreGLib_CopyPrivateHeaders
+)
+
 set(JavaScriptCore_INSTALLED_HEADERS
-    ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h
+    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCAutocleanups.h
     ${JAVASCRIPTCORE_DIR}/API/glib/JSCClass.h
@@ -36 +79 @@
     ${JAVASCRIPTCORE_DIR}/API/glib/jsc.h
 )
-
-configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h)
-
-# These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.
-add_custom_command(
-    OUTPUT ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
-    DEPENDS ${JAVASCRIPTCORE_DIR}/API/glib
-    COMMAND ln -n -s -f ${JAVASCRIPTCORE_DIR}/API/glib ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
-    VERBATIM
-)
-add_custom_target(JSC-fake-api-headers
-    DEPENDS ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
-)
-set(JavaScriptCore_EXTRA_DEPENDENCIES
-    JSC-fake-api-headers
-)