Changeset 230585 in webkit


Ignore:
Timestamp:
Apr 12, 2018 11:19:50 AM (6 years ago)
Author:
Michael Catanzaro
Message:

[WPE] Move libWPEWebInspectorResources.so to pkglibdir
https://bugs.webkit.org/show_bug.cgi?id=184379

Reviewed by Žan Doberšek.

Source/JavaScriptCore:

Load the module from the new location.

  • PlatformWPE.cmake:
  • inspector/remote/glib/RemoteInspectorUtils.cpp:

(Inspector::backendCommands):

Source/WebKit:

This is important to allow parallel installation.

  • PlatformWPE.cmake:
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r230577 r230585  
     12018-04-12  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Move libWPEWebInspectorResources.so to pkglibdir
     4        https://bugs.webkit.org/show_bug.cgi?id=184379
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Load the module from the new location.
     9
     10        * PlatformWPE.cmake:
     11        * inspector/remote/glib/RemoteInspectorUtils.cpp:
     12        (Inspector::backendCommands):
     13
    1142018-04-12  Yusuke Suzuki  <utatane.tea@gmail.com>
    215
  • trunk/Source/JavaScriptCore/PlatformWPE.cmake

    r230576 r230585  
    3434
    3535add_definitions(-DJSC_COMPILATION)
     36add_definitions(-DPKGLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}/wpe-webkit-${WPE_API_VERSION}")
  • trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp

    r217832 r230585  
    4646    static std::once_flag flag;
    4747    std::call_once(flag, [] {
    48         GModule* resourcesModule = g_module_open("libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);
     48        GModule* resourcesModule = g_module_open(PKGLIBDIR G_DIR_SEPARATOR_S "libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);
    4949        if (!resourcesModule) {
    5050            WTFLogAlways("Error loading libWPEWebInspectorResources.so: %s", g_module_error());
  • trunk/Source/WebKit/ChangeLog

    r230576 r230585  
     12018-04-12  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Move libWPEWebInspectorResources.so to pkglibdir
     4        https://bugs.webkit.org/show_bug.cgi?id=184379
     5
     6        Reviewed by Žan Doberšek.
     7
     8        This is important to allow parallel installation.
     9
     10        * PlatformWPE.cmake:
     11
    1122018-04-12  Michael Catanzaro  <mcatanzaro@igalia.com>
    213
  • trunk/Source/WebKit/PlatformWPE.cmake

    r230576 r230585  
    314314target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES})
    315315target_include_directories(WPEWebInspectorResources SYSTEM PUBLIC ${WPEWebInspectorResources_SYSTEM_INCLUDE_DIRECTORIES})
    316 install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}")
     316install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}")
    317317
    318318add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
Note: See TracChangeset for help on using the changeset viewer.