Title: [230661] trunk
- Revision
- 230661
- Author
- mcatanz...@igalia.com
- Date
- 2018-04-15 09:32:26 -0700 (Sun, 15 Apr 2018)
Log Message
[WPE] Install files needed for WebKitWebExtensions
https://bugs.webkit.org/show_bug.cgi?id=179915
Reviewed by Žan Doberšek.
.:
* Source/cmake/OptionsWPE.cmake:
Source/WebKit:
* PlatformWPE.cmake: Install pkg-config file, injected bundle, and API headers.
* UIProcess/API/glib/WebKitWebContext.cpp: Load the injected bundle when installed.
* wpe/wpe-web-extension.pc.in: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (230660 => 230661)
--- trunk/ChangeLog 2018-04-15 01:42:00 UTC (rev 230660)
+++ trunk/ChangeLog 2018-04-15 16:32:26 UTC (rev 230661)
@@ -1,3 +1,12 @@
+2018-04-15 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE] Install files needed for WebKitWebExtensions
+ https://bugs.webkit.org/show_bug.cgi?id=179915
+
+ Reviewed by Žan Doberšek.
+
+ * Source/cmake/OptionsWPE.cmake:
+
2018-04-12 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r230554.
Modified: trunk/Source/WebKit/ChangeLog (230660 => 230661)
--- trunk/Source/WebKit/ChangeLog 2018-04-15 01:42:00 UTC (rev 230660)
+++ trunk/Source/WebKit/ChangeLog 2018-04-15 16:32:26 UTC (rev 230661)
@@ -1,3 +1,14 @@
+2018-04-15 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE] Install files needed for WebKitWebExtensions
+ https://bugs.webkit.org/show_bug.cgi?id=179915
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformWPE.cmake: Install pkg-config file, injected bundle, and API headers.
+ * UIProcess/API/glib/WebKitWebContext.cpp: Load the injected bundle when installed.
+ * wpe/wpe-web-extension.pc.in: Added.
+
2018-04-14 Carlos Eduardo Ramalho <cadubent...@gmail.com>
[GTK][WPE] Build is broken after r230640
Modified: trunk/Source/WebKit/PlatformWPE.cmake (230660 => 230661)
--- trunk/Source/WebKit/PlatformWPE.cmake 2018-04-15 01:42:00 UTC (rev 230660)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2018-04-15 16:32:26 UTC (rev 230661)
@@ -11,9 +11,11 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc @ONLY)
+configure_file(wpe/wpe-web-extension.pc.in ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc @ONLY)
add_definitions(-DWEBKIT2_COMPILATION)
+add_definitions(-DPKGLIBDIR="${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}")
add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
@@ -158,11 +160,8 @@
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebHitTestResult.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebPage.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/webkit-web-extension.h
-)
-
-set(WPE_DOM_API_INSTALLED_HEADERS
- ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdomdefines.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdom.h
+ ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDefines.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDocument.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMElement.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMNode.h
@@ -322,12 +321,18 @@
target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES})
target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
+install(TARGETS WPEInjectedBundle
+ DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}/injected-bundle"
+)
+
install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
- COMPONENT "Development"
+ "${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+ COMPONENT "Development"
)
install(FILES ${WPE_API_INSTALLED_HEADERS}
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe"
- COMPONENT "Development"
+ ${WPE_WEB_EXTENSION_API_INSTALLED_HEADERS}
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe"
+ COMPONENT "Development"
)
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (230660 => 230661)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-04-15 01:42:00 UTC (rev 230660)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-04-15 16:32:26 UTC (rev 230661)
@@ -263,8 +263,8 @@
G_DIR_SEPARATOR_S "injected-bundle" G_DIR_SEPARATOR_S;
return injectedBundlePath;
#elif PLATFORM(WPE)
- // FIXME: Make it possible to use installed injected bundle in WPE.
- return nullptr;
+ static const char* injectedBundlePath = PKGLIBDIR G_DIR_SEPARATOR_S "injected-bundle" G_DIR_SEPARATOR_S;
+ return injectedBundlePath;
#endif
}
Added: trunk/Source/WebKit/wpe/wpe-web-extension.pc.in (0 => 230661)
--- trunk/Source/WebKit/wpe/wpe-web-extension.pc.in (rev 0)
+++ trunk/Source/WebKit/wpe/wpe-web-extension.pc.in 2018-04-15 16:32:26 UTC (rev 230661)
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: WPE WebKit Web process extensions
+Description: Embeddable Web content engine - Web process extensions
+URL: https://wpewebkit.org
+Version: @PROJECT_VERSION@
+Requires: glib-2.0 libsoup-2.4
+Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
+Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
