Changeset 230661 in webkit


Ignore:
Timestamp:
Apr 15, 2018 9:32:26 AM (6 years ago)
Author:
Michael Catanzaro
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.
Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r230586 r230661  
     12018-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
    1102018-04-12  Ryan Haddad  <ryanhaddad@apple.com>
    211
  • trunk/Source/WebKit/ChangeLog

    r230657 r230661  
     12018-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
    1122018-04-14  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
    213
  • trunk/Source/WebKit/PlatformWPE.cmake

    r230585 r230661  
    1212
    1313configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc @ONLY)
     14configure_file(wpe/wpe-web-extension.pc.in ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc @ONLY)
    1415
    1516add_definitions(-DWEBKIT2_COMPILATION)
    1617
     18add_definitions(-DPKGLIBDIR="${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}")
    1719add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
    1820add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
     
    159161    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebPage.h
    160162    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/webkit-web-extension.h
    161 )
    162 
    163 set(WPE_DOM_API_INSTALLED_HEADERS
    164     ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdomdefines.h
    165163    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/webkitdom.h
     164    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDefines.h
    166165    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMDocument.h
    167166    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM/WebKitDOMElement.h
     
    323322target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
    324323
     324install(TARGETS WPEInjectedBundle
     325        DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}/injected-bundle"
     326)
     327
    325328install(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"
    328332)
    329333
    330334install(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  
    264264    return injectedBundlePath;
    265265#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;
    268268#endif
    269269}
Note: See TracChangeset for help on using the changeset viewer.