Attachment 431318 Details for Bug 226662 – Very WIP Patch

[patch] Very WIP Patch

bug-226662-20210614164041.patch (text/plain), 19.70 KB, created by Adrian Perez on 2021-06-14 06:40:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2021-06-14 06:40:43 PDT

Size: 19.70 KB

patch

obsolete

>Subversion Revision: 278822
>diff --git a/Source/JavaScriptCore/API/glib/docs/javascriptcore.toml.in b/Source/JavaScriptCore/API/glib/docs/javascriptcore.toml.in
>new file mode 100644
>index 0000000000000000000000000000000000000000..d6fa212afaf4d27f7aac4cae1f23b6a9a7ba6e63
>--- /dev/null
>+++ b/Source/JavaScriptCore/API/glib/docs/javascriptcore.toml.in
>@@ -0,0 +1,33 @@
>+[library]
>+description = "The JavaScriptCore library"
>+license = ["BSD", "LGPL-2.1"]
>+authors = "The WebKit GTK and WPE teams"
>+version = "@PROJECT_VERSION@"
>+repository_url = "https://trac.webkit.org/browser/webkit"
>+website_url = "https://webkit.org"
>+dependencies = ["GLib-2.0", "GObject-2.0", "Gio-2.0"]
>+devhelp = true
>+search_index = true
>+
>+[dependencies."GLib-2.0"]
>+name = "GLib"
>+description = "The base utility library"
>+docs_url = "https://developer.gnome.org/glib/stable"
>+
>+[dependencies."GObject-2.0"]
>+name = "GObject"
>+description = "The base type system library"
>+docs_url = "https://developer.gnome.org/gobject/stable"
>+
>+[dependencies."Gio-2.0"]
>+name = "Gio"
>+description = "The GLib input/output library"
>+docs_url = "https://developer.gnome.org/gio/stable"
>+
>+[theme]
>+name = "basic"
>+show_index_summary = true
>+show_class_hierarchy = true
>+
>+[source-location]
>+base_url = "https://trac.webkit.org/browser/webkit/trunk"
>diff --git a/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0-sections.txt b/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0-sections.txt
>deleted file mode 100644
>index 36a0c8d73741df02e4050d1c6e6d646fa03deb01..0000000000000000000000000000000000000000
>--- a/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0-sections.txt
>+++ /dev/null
>@@ -1,258 +0,0 @@
>-<SECTION>
>-<FILE>JSCVirtualMachine</FILE>
>-<TITLE>JSCVirtualMachine</TITLE>
>-JSCVirtualMachine
>-jsc_virtual_machine_new
>-
>-<SUBSECTION Standard>
>-JSCVirtualMachineClass
>-JSC_TYPE_VIRTUAL_MACHINE
>-JSC_VIRTUAL_MACHINE
>-JSC_IS_VIRTUAL_MACHINE
>-JSC_VIRTUAL_MACHINE_CLASS
>-JSC_IS_VIRTUAL_MACHINE_CLASS
>-JSC_VIRTUAL_MACHINE_GET_CLASS
>-
>-<SUBSECTION Private>
>-JSCVirtualMachinePrivate
>-jsc_virtual_machine_get_type
>-JSC_API
>-JSC_DEPRECATED
>-JSC_DEPRECATED_FOR
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCContext</FILE>
>-<TITLE>JSCContext</TITLE>
>-JSCContext
>-JSCExceptionHandler
>-JSCCheckSyntaxMode
>-JSCCheckSyntaxResult
>-jsc_context_new
>-jsc_context_new_with_virtual_machine
>-jsc_context_get_virtual_machine
>-jsc_context_get_exception
>-jsc_context_throw
>-jsc_context_throw_printf
>-jsc_context_throw_with_name
>-jsc_context_throw_with_name_printf
>-jsc_context_throw_exception
>-jsc_context_clear_exception
>-jsc_context_push_exception_handler
>-jsc_context_pop_exception_handler
>-jsc_context_get_current
>-jsc_context_evaluate
>-jsc_context_evaluate_with_source_uri
>-jsc_context_evaluate_in_object
>-jsc_context_check_syntax
>-jsc_context_get_global_object
>-jsc_context_set_value
>-jsc_context_get_value
>-jsc_context_register_class
>-
>-<SUBSECTION Standard>
>-JSCContextClass
>-JSC_TYPE_CONTEXT
>-JSC_CONTEXT
>-JSC_IS_CONTEXT
>-JSC_CONTEXT_CLASS
>-JSC_IS_CONTEXT_CLASS
>-JSC_CONTEXT_GET_CLASS
>-
>-<SUBSECTION Private>
>-JSCContextPrivate
>-jsc_context_get_type
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCValue</FILE>
>-<TITLE>JSCValue</TITLE>
>-JSCValue
>-JSCValuePropertyFlags
>-jsc_value_get_context
>-jsc_value_new_undefined
>-jsc_value_is_undefined
>-jsc_value_new_null
>-jsc_value_is_null
>-jsc_value_new_number
>-jsc_value_is_number
>-jsc_value_to_double
>-jsc_value_to_int32
>-jsc_value_new_boolean
>-jsc_value_is_boolean
>-jsc_value_to_boolean
>-jsc_value_new_string
>-jsc_value_new_string_from_bytes
>-jsc_value_is_string
>-jsc_value_to_string
>-jsc_value_to_string_as_bytes
>-jsc_value_new_array
>-jsc_value_new_array_from_garray
>-jsc_value_new_array_from_strv
>-jsc_value_is_array
>-jsc_value_new_object
>-jsc_value_is_object
>-jsc_value_object_is_instance_of
>-jsc_value_object_set_property
>-jsc_value_object_get_property
>-jsc_value_object_set_property_at_index
>-jsc_value_object_get_property_at_index
>-jsc_value_object_has_property
>-jsc_value_object_delete_property
>-jsc_value_object_enumerate_properties
>-jsc_value_object_invoke_method
>-jsc_value_object_invoke_methodv
>-jsc_value_object_define_property_data
>-jsc_value_object_define_property_accessor
>-jsc_value_new_function
>-jsc_value_new_functionv
>-jsc_value_new_function_variadic
>-jsc_value_is_function
>-jsc_value_function_call
>-jsc_value_function_callv
>-jsc_value_is_constructor
>-jsc_value_constructor_call
>-jsc_value_constructor_callv
>-jsc_value_new_from_json
>-jsc_value_to_json
>-
>-<SUBSECTION Standard>
>-JSCValueClass
>-JSC_TYPE_VALUE
>-JSC_VALUE
>-JSC_IS_VALUE
>-JSC_VALUE_CLASS
>-JSC_IS_VALUE_CLASS
>-JSC_VALUE_GET_CLASS
>-
>-<SUBSECTION Private>
>-JSCValuePrivate
>-jsc_value_get_type
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCWeakValue</FILE>
>-<TITLE>JSCWeakValue</TITLE>
>-JSCWeakValue
>-jsc_weak_value_new
>-jsc_weak_value_get_value
>-
>-<SUBSECTION Standard>
>-JSCWeakValueClass
>-JSC_TYPE_WEAK_VALUE
>-JSC_WEAK_VALUE
>-JSC_IS_WEAK_VALUE
>-JSC_WEAK_VALUE_CLASS
>-JSC_IS_WEAK_VALUE_CLASS
>-JSC_WEAK_VALUE_GET_CLASS
>-
>-<SUBSECTION Private>
>-JSCWeakValuePrivate
>-jsc_weak_value_get_type
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCException</FILE>
>-<TITLE>JSCException</TITLE>
>-JSCException
>-jsc_exception_new
>-jsc_exception_new_printf
>-jsc_exception_new_vprintf
>-jsc_exception_new_with_name
>-jsc_exception_new_with_name_printf
>-jsc_exception_new_with_name_vprintf
>-jsc_exception_get_name
>-jsc_exception_get_message
>-jsc_exception_get_line_number
>-jsc_exception_get_column_number
>-jsc_exception_get_source_uri
>-jsc_exception_get_backtrace_string
>-jsc_exception_to_string
>-jsc_exception_report
>-
>-<SUBSECTION Standard>
>-JSCExceptionClass
>-JSC_TYPE_EXCEPTION
>-JSC_EXCEPTION
>-JSC_IS_EXCEPTION
>-JSC_EXCEPTION_CLASS
>-JSC_IS_EXCEPTION_CLASS
>-JSC_EXCEPTION_GET_CLASS
>-
>-<SUBSECTION Private>
>-JSCExceptionPrivate
>-jsc_exception_get_type
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCClass</FILE>
>-<TITLE>JSCClass</TITLE>
>-JSCClass
>-JSCClassGetPropertyFunction
>-JSCClassSetPropertyFunction
>-JSCClassHasPropertyFunction
>-JSCClassDeletePropertyFunction
>-JSCClassEnumeratePropertiesFunction
>-JSCClassVTable
>-jsc_class_get_name
>-jsc_class_get_parent
>-jsc_class_add_constructor
>-jsc_class_add_constructorv
>-jsc_class_add_constructor_variadic
>-jsc_class_add_method
>-jsc_class_add_methodv
>-jsc_class_add_method_variadic
>-jsc_class_add_property
>-
>-<SUBSECTION Standard>
>-JSC_TYPE_CLASS
>-JSC_CLASS
>-JSC_IS_CLASS
>-
>-<SUBSECTION Private>
>-jsc_class_get_type
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCOptions</FILE>
>-<TITLE>JSCOptions</TITLE>
>-jsc_options_set_boolean
>-jsc_options_get_boolean
>-jsc_options_set_int
>-jsc_options_get_int
>-jsc_options_set_uint
>-jsc_options_get_uint
>-jsc_options_set_size
>-jsc_options_get_size
>-jsc_options_set_double
>-jsc_options_get_double
>-jsc_options_set_string
>-jsc_options_get_string
>-jsc_options_set_range_string
>-jsc_options_get_range_string
>-
>-JSCOptionType
>-JSCOptionsFunc
>-jsc_options_foreach
>-
>-jsc_options_get_option_group
>-<SUBSECTION>
>-JSC_OPTIONS_USE_JIT
>-JSC_OPTIONS_USE_DFG
>-JSC_OPTIONS_USE_FTL
>-JSC_OPTIONS_USE_LLINT
>-</SECTION>
>-
>-<SECTION>
>-<FILE>JSCVersion</FILE>
>-<TITLE>JSCVersion</TITLE>
>-jsc_get_major_version
>-jsc_get_minor_version
>-jsc_get_micro_version
>-
>-<SUBSECTION>
>-JSC_MAJOR_VERSION
>-JSC_MINOR_VERSION
>-JSC_MICRO_VERSION
>-JSC_CHECK_VERSION
>-</SECTION>
>diff --git a/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0.types b/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0.types
>deleted file mode 100644
>index c80a76f3f433d6bc3eb578362b1815a236aa0bfc..0000000000000000000000000000000000000000
>--- a/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0.types
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-#include <jsc/jsc.h>
>-jsc_virtual_machine_get_type
>-jsc_context_get_type
>-jsc_value_get_type
>-jsc_exception_get_type
>-jsc_class_get_type
>diff --git a/Source/JavaScriptCore/API/glib/docs/jsc-glib-docs.sgml b/Source/JavaScriptCore/API/glib/docs/jsc-glib-docs.sgml
>deleted file mode 100644
>index ca3eb5df289797601ee3987e59c67679dabf4b4a..0000000000000000000000000000000000000000
>--- a/Source/JavaScriptCore/API/glib/docs/jsc-glib-docs.sgml
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-<?xml version="1.0"?>
>-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
>-          "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
>-<!ENTITY version SYSTEM "version.xml">
>-]>
>-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
>-  <bookinfo>
>-    <title>JavaScriptCore GLib Reference Manual</title>
>-    <releaseinfo>for JavaScriptCore &version;</releaseinfo>
>-  </bookinfo>
>-
>-  <chapter>
>-    <title>Class Overview</title>
>-    <xi:include href="xml/JSCVirtualMachine.xml"/>
>-    <xi:include href="xml/JSCContext.xml"/>
>-    <xi:include href="xml/JSCValue.xml"/>
>-    <xi:include href="xml/JSCWeakValue.xml"/>
>-    <xi:include href="xml/JSCException.xml"/>
>-    <xi:include href="xml/JSCClass.xml"/>
>-    <xi:include href="xml/JSCOptions.xml"/>
>-    <xi:include href="xml/JSCVersion.xml"/>
>-  </chapter>
>-
>-  <index id="index-all">
>-    <title>Index</title>
>-  </index>
>-
>-  <index id="api-index-2-24" role="2.24">
>-    <title>Index of new symbols in 2.24</title>
>-    <xi:include href="xml/api-index-2.24.xml"><xi:fallback /></xi:include>
>-  </index>
>-
>-  <index id="api-index-2-28" role="2.28">
>-    <title>Index of new symbols in 2.28</title>
>-    <xi:include href="xml/api-index-2.28.xml"><xi:fallback /></xi:include>
>-  </index>
>-
>-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
>-</book>
>diff --git a/Source/JavaScriptCore/PlatformWPE.cmake b/Source/JavaScriptCore/PlatformWPE.cmake
>index 0f8c178a7ca5f9710b50b28332fdf3a55a673663..ee3649c417cbe30da3e424d14f217294bca8c66c 100644
>--- a/Source/JavaScriptCore/PlatformWPE.cmake
>+++ b/Source/JavaScriptCore/PlatformWPE.cmake
>@@ -17,3 +17,92 @@ install(FILES ${JavaScriptCore_INSTALLED_HEADERS}
> 
> add_definitions(-DJSC_COMPILATION)
> add_definitions(-DPKGLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}/wpe-webkit-${WPE_API_VERSION}")
>+
>+if (ENABLE_INTROSPECTION)
>+    set(JavaScriptCore_GIR_NAME "JavaScriptCore-${WPE_API_VERSION}")
>+    set(JavaScriptCore_GIR "${CMAKE_BINARY_DIR}/${JavaScriptCore_GIR_NAME}.gir")
>+
>+    function(get_target_doc_sources target varname)
>+        set(result "")
>+        get_property(sources TARGET ${target} PROPERTY SOURCES)
>+        get_property(srcdir TARGET ${target} PROPERTY SOURCE_DIR)
>+        foreach (src IN LISTS sources)
>+            get_filename_component(name "${src}" NAME)
>+            get_filename_component(src "${src}" REALPATH BASE_DIR "${srcdir}")
>+            get_property(isobject SOURCE "${src}" PROPERTY EXTERNAL_OBJECT)
>+            get_property(location SOURCE "${src}" PROPERTY LOCATION)
>+            if (NOT isobject AND NOT name STREQUAL "cmakeconfig.h")
>+                list(APPEND result "${location}")
>+            endif ()
>+        endforeach ()
>+        set(${varname} ${result} PARENT_SCOPE)
>+    endfunction()
>+
>+    function(get_target_compile_flags target varname)
>+        set(result "")
>+        get_property(srcdir TARGET ${target} PROPERTY SOURCE_DIR)
>+
>+        get_property(defs TARGET ${target} PROPERTY COMPILE_DEFINITIONS)
>+        get_property(dirdefs DIRECTORY "${srcdir}" PROPERTY COMPILE_DEFINITIONS)
>+        foreach (def IN LISTS defs dirdefs)
>+            list(APPEND result "-D${def}")
>+        endforeach ()
>+
>+        get_property(incs TARGET ${target} PROPERTY INCLUDE_DIRECTORIES)
>+        get_property(dirincs DIRECTORY "${srcdir}" PROPERTY INCLUDE_DIRECTORIES)
>+        foreach (inc IN LISTS incs dirincs)
>+            list(APPEND result "-I${inc}")
>+        endforeach ()
>+
>+        set(${varname} ${result} PARENT_SCOPE)
>+    endfunction()
>+
>+    get_target_doc_sources(JavaScriptCore JavaScriptCore_DOC_SOURCES)
>+    get_target_compile_flags(JavaScriptCore JavaScriptCore_DOC_FLAGS)
>+
>+    add_custom_command(
>+        OUTPUT "${JavaScriptCore_GIR}"
>+        COMMENT "Generating ${JavaScriptCore_GIR_NAME}.gir ..."
>+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
>+        DEPENDS WebKit
>+        VERBATIM
>+        COMMAND CC="${CMAKE_C_COMPILER}"
>+            ${INTROSPECTION_SCANNER}
>+            --output=${JavaScriptCore_GIR}
>+            --warn-all
>+            --no-libtool
>+            --library=$<TARGET_FILE_BASE_NAME:WebKit>
>+            --library-path=$<TARGET_FILE_DIR:WebKit>
>+            --nsversion=${WPE_API_VERSION}
>+            --c-include=jsc/jsc.h
>+            --namespace=JavaScriptCore
>+            --identifier-prefix=JSC
>+            --symbol-prefix=jsc
>+            --pkg-export=javascriptcore-${WPE_API_VERSION}
>+            --pkg=gobject-2.0
>+            --pkg=gio-2.0
>+            --pkg=glib-2.0
>+            -I${FORWARDING_HEADERS_WPE_JSC_DIR}
>+            -I${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}
>+            ${JavaScriptCore_DOC_FLAGS}
>+            ${JavaScriptCore_DOC_SOURCES}
>+            ${JavaScriptCore_INSTALLED_HEADERS}
>+    )
>+    add_custom_target(JavaScriptCore-gir DEPENDS "${JavaScriptCore_GIR}")
>+endif ()
>+
>+if (ENABLE_DOCUMENTATION)
>+    configure_file(API/glib/docs/javascriptcore.toml.in javascriptcore.toml @ONLY)
>+    add_custom_command(
>+        OUTPUT "${CMAKE_BINARY_DIR}/Documentation/index.html"
>+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
>+        COMMENT "Generating documentation for ${JavaScriptCore_GIR_NAME}"
>+        DEPENDS javascriptcore.toml "${JavaScriptCore_GIR}"
>+        VERBATIM
>+        COMMAND "${GIDocgen_EXE}" generate --no-namespace-dir
>+            --output-dir "${CMAKE_BINARY_DIR}/Documentation"
>+            --config "${CMAKE_CURRENT_BINARY_DIR}/javascriptcore.toml"
>+            "${JavaScriptCore_GIR}"
>+    )
>+    add_custom_target(JavaScriptCore-doc DEPENDS "${CMAKE_BINARY_DIR}/Documentation/index.html")
>+endif ()
>diff --git a/Source/PlatformWPE.cmake b/Source/PlatformWPE.cmake
>index fabd776e617d07a6c30b9f2df30f884491259359..8e61bfced80ed5341861f9ac60274516e3d32790 100644
>--- a/Source/PlatformWPE.cmake
>+++ b/Source/PlatformWPE.cmake
>@@ -1,39 +1,39 @@
>-include(GtkDoc)
> include(WebKitDist)
> 
>-list(APPEND DocumentationDependencies
>-    WebKit
>-    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml"
>-    "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-docs.sgml"
>-    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_DOC_VERSION}-sections.txt"
>-    "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_DOC_VERSION}-sections.txt"
>-)
> 
>-if (ENABLE_GTKDOC)
>-    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_VERSION}/html/wpe-${WPE_API_VERSION}
>-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>-    )
>-    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_VERSION}/html/wpe-webextensions-${WPE_API_VERSION}
>-        DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>-    )
>-endif ()
>+# list(APPEND DocumentationDependencies
>+#     WebKit
>+#     "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml"
>+#     "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-docs.sgml"
>+#     "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_DOC_VERSION}-sections.txt"
>+#     "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_DOC_VERSION}-sections.txt"
>+# )
> 
>-ADD_GTKDOC_GENERATOR("docs-build.stamp" "--wpe")
>-if (ENABLE_GTKDOC)
>-    add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
>-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
>-    add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
>+# if (ENABLE_GTKDOC)
>+#     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_VERSION}/html/wpe-${WPE_API_VERSION}
>+#             DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>+#     )
>+#     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_VERSION}/html/wpe-webextensions-${WPE_API_VERSION}
>+#         DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>+#     )
>+# endif ()
> 
>-    # Add a default build step which check that documentation does not have any warnings
>-    # or errors. This is useful to prevent breaking documentation inadvertently during
>-    # the course of development.
>-    if (DEVELOPER_MODE)
>-        ADD_GTKDOC_GENERATOR("docs-build-no-html.stamp" "--wpe;--skip-html")
>-        add_custom_target(gtkdoc-no-html ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp")
>-    endif ()
>-endif ()
>+# ADD_GTKDOC_GENERATOR("docs-build.stamp" "--wpe")
>+# if (ENABLE_GTKDOC)
>+#     add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
>+# elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
>+#     add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
>+
>+#     # Add a default build step which check that documentation does not have any warnings
>+#     # or errors. This is useful to prevent breaking documentation inadvertently during
>+#     # the course of development.
>+#     if (DEVELOPER_MODE)
>+#         ADD_GTKDOC_GENERATOR("docs-build-no-html.stamp" "--wpe;--skip-html")
>+#         add_custom_target(gtkdoc-no-html ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp")
>+#     endif ()
>+# endif ()
> 
> if (DEVELOPER_MODE)
>-    add_custom_target(Documentation DEPENDS gtkdoc)
>+    # add_custom_target(Documentation DEPENDS gtkdoc)
>     WEBKIT_DECLARE_DIST_TARGETS(WPE wpewebkit ${TOOLS_DIR}/wpe/manifest.txt.in)
> endif ()
>diff --git a/Source/cmake/FindGIDocgen.cmake b/Source/cmake/FindGIDocgen.cmake
>new file mode 100644
>index 0000000000000000000000000000000000000000..7bfc45cf742d434891cb39826b7e4306a5c0d96e
>--- /dev/null
>+++ b/Source/cmake/FindGIDocgen.cmake
>@@ -0,0 +1,21 @@
>+find_program(GIDocgen_EXE
>+    NAMES gi-docgen gi-docgen.py
>+    HINTS "${CMAKE_SOURCE_DIR}/gi-docgen"
>+    DOC "Path to the gi-docgen program"
>+    REQUIRED
>+)
>+
>+execute_process(
>+    COMMAND "${GIDocgen_EXE}" --version
>+    OUTPUT_VARIABLE GIDocgen_VERSION
>+    OUTPUT_STRIP_TRAILING_WHITESPACE
>+    COMMAND_ERROR_IS_FATAL ANY
>+    ERROR_QUIET
>+)
>+
>+include(FindPackageHandleStandardArgs)
>+find_package_handle_standard_args(GIDocgen
>+    FOUND_VAR GIDocgen_FOUND
>+    REQUIRED_VARS GIDocgen_EXE
>+    VERSION_VAR GIDocgen_VERSION
>+)
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index aefcaae96be00bfef8332861112343f5cad9901b..bf75c1f47d9740daba351cc734493052d102c03c 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -71,7 +71,9 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEAT
> # Public options specific to the WPE port. Do not add any options here unless
> # there is a strong reason we should support changing the value of the option,
> # and the option is not relevant to any other WebKit ports.
>-WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
>+# WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
>+WEBKIT_OPTION_DEFINE(ENABLE_DOCUMENTATION "Whether or not to build documentation." PUBLIC ${ENABLE_DEVELOPER_MODE})
>+WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ${ENABLE_DEVELOPER_MODE})
> WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE})
> WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON)
>@@ -114,6 +116,7 @@ endif ()
> 
> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_HOLEPUNCH ENABLE_VIDEO)
> WEBKIT_OPTION_DEPEND(USE_EXTERNAL_HOLEPUNCH ENABLE_VIDEO)
>+WEBKIT_OPTION_DEPEND(ENABLE_DOCUMENTATION ENABLE_INTROSPECTION)
> 
> include(GStreamerDependencies)
> 
>@@ -179,6 +182,14 @@ if (USE_WOFF2)
>     endif ()
> endif ()
> 
>+if (ENABLE_INTROSPECTION)
>+    find_package(GObjectIntrospection REQUIRED)
>+endif ()
>+
>+if (ENABLE_DOCUMENTATION)
>+    find_package(GIDocgen REQUIRED)
>+endif ()
>+
> if (ENABLE_WEB_CRYPTO)
>     find_package(Libtasn1 REQUIRED)
>     if (NOT LIBTASN1_FOUND)

Actions: View | Formatted Diff | Diff

Attachments on bug 226662: 431318 | 453880 | 454294 | 455242 | 456344 | 456377 | 456398