Changeset 230661 in webkit
- Timestamp:
- Apr 15, 2018 9:32:26 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r230586 r230661 1 2018-04-15 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [WPE] Install files needed for WebKitWebExtensions 4 https://bugs.webkit.org/show_bug.cgi?id=179915 5 6 Reviewed by Žan Doberšek. 7 8 * Source/cmake/OptionsWPE.cmake: 9 1 10 2018-04-12 Ryan Haddad <ryanhaddad@apple.com> 2 11 -
trunk/Source/WebKit/ChangeLog
r230657 r230661 1 2018-04-15 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [WPE] Install files needed for WebKitWebExtensions 4 https://bugs.webkit.org/show_bug.cgi?id=179915 5 6 Reviewed by Žan Doberšek. 7 8 * PlatformWPE.cmake: Install pkg-config file, injected bundle, and API headers. 9 * UIProcess/API/glib/WebKitWebContext.cpp: Load the injected bundle when installed. 10 * wpe/wpe-web-extension.pc.in: Added. 11 1 12 2018-04-14 Carlos Eduardo Ramalho <cadubentzen@gmail.com> 2 13 -
trunk/Source/WebKit/PlatformWPE.cmake
r230585 r230661 12 12 13 13 configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc @ONLY) 14 configure_file(wpe/wpe-web-extension.pc.in ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc @ONLY) 14 15 15 16 add_definitions(-DWEBKIT2_COMPILATION) 16 17 18 add_definitions(-DPKGLIBDIR="${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}") 17 19 add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}") 18 20 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") … … 159 161 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebPage.h 160 162 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/webkit-web-extension.h 161 )162 163 set(WPE_DOM_API_INSTALLED_HEADERS164 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdomdefines.h165 163 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdom.h 164 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDefines.h 166 165 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDocument.h 167 166 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMElement.h … … 323 322 target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) 324 323 324 install(TARGETS WPEInjectedBundle 325 DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}/injected-bundle" 326 ) 327 325 328 install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc" 326 DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" 327 COMPONENT "Development" 329 "${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc" 330 DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" 331 COMPONENT "Development" 328 332 ) 329 333 330 334 install(FILES ${WPE_API_INSTALLED_HEADERS} 331 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe" 332 COMPONENT "Development" 333 ) 335 ${WPE_WEB_EXTENSION_API_INSTALLED_HEADERS} 336 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe" 337 COMPONENT "Development" 338 ) -
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
r226349 r230661 264 264 return injectedBundlePath; 265 265 #elif PLATFORM(WPE) 266 // FIXME: Make it possible to use installed injected bundle in WPE.267 return nullptr;266 static const char* injectedBundlePath = PKGLIBDIR G_DIR_SEPARATOR_S "injected-bundle" G_DIR_SEPARATOR_S; 267 return injectedBundlePath; 268 268 #endif 269 269 }
Note: See TracChangeset
for help on using the changeset viewer.