Attachment 240344 Details for Bug 138006 – Patch

[patch] Patch

wk-disable-introspection.diff (text/plain), 6.64 KB, created by Carlos Garcia Campos on 2014-10-23 05:46:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2014-10-23 05:46:45 PDT

Size: 6.64 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 61c8db7..256165f 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2014-10-23  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        REGRESSION(CMake): Make it possible to build without introspection
>+        https://bugs.webkit.org/show_bug.cgi?id=138006
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add ENABLE_INTROSPECTION option.
>+
>+        * Source/PlatformGTK.cmake: Dot not add gir global target if
>+        introspection is disabled.
>+        * Source/cmake/OptionsGTK.cmake: Do not add gir individual targets if
>+        introspection is disabled.
>+
> 2014-10-21  Ryuan Choi  <ryuan.choi@gmail.com>
> 
>         [EFL] Remove unnecessary ENABLE_3D_RENDERING definition from OptionsEfl.cmake
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 154ea5f..dada503 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2014-10-23  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        REGRESSION(CMake): Make it possible to build without introspection
>+        https://bugs.webkit.org/show_bug.cgi?id=138006
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not install introspection files when introspection is disabled.
>+
>+        * PlatformGTK.cmake:
>+
> 2014-10-22  Milan Crha  <mcrha@redhat.com>
> 
>         Prefix isnan() with std::.
>diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
>index 1aa0ae9..437ac78 100644
>--- a/Source/JavaScriptCore/PlatformGTK.cmake
>+++ b/Source/JavaScriptCore/PlatformGTK.cmake
>@@ -23,12 +23,15 @@ install(FILES API/JavaScript.h
>         DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/JavaScriptCore"
> )
> 
>-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
>-        DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
>-)
>-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
>-        DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
>-)
>+if (ENABLE_INTROSPECTION)
>+    install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
>+            DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
>+    )
>+    install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
>+            DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
>+    )
>+endif ()
>+
> add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
> 
> list(APPEND JavaScriptCore_LIBRARIES
>diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
>index a0e421a..0ce6df1 100644
>--- a/Source/PlatformGTK.cmake
>+++ b/Source/PlatformGTK.cmake
>@@ -1,7 +1,9 @@
> add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
> 
> # This allows exposing a 'gir' target which builds all GObject introspection files.
>-add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
>+if (ENABLE_INTROSPECTION)
>+    add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
>+endif ()
> 
> list(APPEND DocumentationDependencies
>     GObjectDOMBindings
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 6206d6b..1bfb604 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,16 @@
> 2014-10-23  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>+        REGRESSION(CMake): Make it possible to build without introspection
>+        https://bugs.webkit.org/show_bug.cgi?id=138006
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not install introspection files when introspection is disabled.
>+
>+        * PlatformGTK.cmake:
>+
>+2014-10-23  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>         [GTK][Cairo] Remove GTK dependency of WidgetBackingStoreGtkX11
>         https://bugs.webkit.org/show_bug.cgi?id=138004
> 
>diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
>index 903e9fa..40faabd 100644
>--- a/Source/WebKit2/PlatformGTK.cmake
>+++ b/Source/WebKit2/PlatformGTK.cmake
>@@ -828,14 +828,17 @@ install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
>               ${WebKit2WebExtension_INSTALLED_HEADERS}
>         DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
> )
>-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
>-              ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
>-        DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
>-)
>-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
>-              ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
>-        DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
>-)
>+
>+if (ENABLE_INTROSPECTION)
>+    install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
>+                  ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
>+            DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
>+    )
>+    install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
>+                  ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
>+            DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
>+    )
>+endif ()
> 
> file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkit2gtk.cfg
>     "[webkit2gtk]\n"
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 8ec94a4..b317071 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -15,6 +15,7 @@ set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support fo
> set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
> set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
> set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
>+set(ENABLE_INTROSPECTION ON CACHE BOOL "Whether to enable GObject introspection.")
> 
> # These are shared variables, but we special case their definition so that we can use the
> # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
>@@ -349,10 +350,12 @@ endif ()
> # Add a typelib file to the list of all typelib dependencies. This makes it easy to
> # expose a 'gir' target with all gobject-introspection files.
> macro(ADD_TYPELIB typelib)
>-    get_filename_component(target_name ${typelib} NAME_WE)
>-    add_custom_target(${target_name}-gir ALL DEPENDS ${typelib})
>-    list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
>-    set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
>+    if (ENABLE_INTROSPECTION)
>+        get_filename_component(target_name ${typelib} NAME_WE)
>+        add_custom_target(${target_name}-gir ALL DEPENDS ${typelib})
>+        list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
>+        set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
>+    endif ()
> endmacro()
> 
> # CMake does not automatically add --whole-archive when building shared objects from

Flags:

pnormand: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 138006: 240344