Changeset 230429 in webkit


Ignore:
Timestamp:
Apr 9, 2018 8:45:48 AM (6 years ago)
Author:
Michael Catanzaro
Message:

[WPE] Use GNU install directories
​https://bugs.webkit.org/show_bug.cgi?id=184377

Reviewed by Carlos Garcia Campos.

.:

Notably, this means all the CMake arguments that distributors use to customize install
directories (-DCMAKE_INSTALL_*DIR) will no longer be ignored.

  • Source/cmake/OptionsCommon.cmake:
  • Source/cmake/OptionsWPE.cmake:

Source/WebKit:

Merge ProcessExecutablePathGtk and ProcessExecutablePathWPE into ProcessExecutablePathGLib.
WPE will now load its secondary processes from PKGLIBEXECDIR, like WebKitGTK+.

  • PlatformWPE.cmake:
  • Shared/glib/ProcessExecutablePathGLib.cpp: Renamed from Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp.

(WebKit::getExecutablePath):
(WebKit::findWebKitProcess):
(WebKit::executablePathOfWebProcess):
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):
(WebKit::executablePathOfStorageProcess):

  • Shared/wpe/ProcessExecutablePathWPE.cpp: Removed.
  • SourcesGTK.txt:
  • SourcesWPE.txt:
Location:
trunk
Files:
1 deleted
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r230385 r230429  
     12018-04-09  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Use GNU install directories
     4        https://bugs.webkit.org/show_bug.cgi?id=184377
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Notably, this means all the CMake arguments that distributors use to customize install
     9        directories (-DCMAKE_INSTALL_*DIR) will no longer be ignored.
     10
     11        * Source/cmake/OptionsCommon.cmake:
     12        * Source/cmake/OptionsWPE.cmake:
     13
    1142018-04-08  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

  • trunk/Source/WebKit/ChangeLog

    r230390 r230429  
     12018-04-09  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Use GNU install directories
     4        https://bugs.webkit.org/show_bug.cgi?id=184377
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Merge ProcessExecutablePathGtk and ProcessExecutablePathWPE into ProcessExecutablePathGLib.
     9        WPE will now load its secondary processes from PKGLIBEXECDIR, like WebKitGTK+.
     10
     11        * PlatformWPE.cmake:
     12        * Shared/glib/ProcessExecutablePathGLib.cpp: Renamed from Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp.
     13        (WebKit::getExecutablePath):
     14        (WebKit::findWebKitProcess):
     15        (WebKit::executablePathOfWebProcess):
     16        (WebKit::executablePathOfPluginProcess):
     17        (WebKit::executablePathOfNetworkProcess):
     18        (WebKit::executablePathOfStorageProcess):
     19        * Shared/wpe/ProcessExecutablePathWPE.cpp: Removed.
     20        * SourcesGTK.txt:
     21        * SourcesWPE.txt:
     22
    1232018-04-09  Michael Catanzaro  <mcatanzaro@igalia.com>
    224

  • trunk/Source/WebKit/PlatformGTK.cmake

    r230385 r230429  
    621621        Shared/cairo/ShareableBitmapCairo.cpp
    622622
     623        Shared/glib/ProcessExecutablePathGLib.cpp
     624
    623625        Shared/gtk/NativeWebKeyboardEventGtk.cpp
    624626        Shared/gtk/NativeWebMouseEventGtk.cpp
    625627        Shared/gtk/NativeWebTouchEventGtk.cpp
    626628        Shared/gtk/NativeWebWheelEventGtk.cpp
    627         Shared/gtk/ProcessExecutablePathGtk.cpp
    628629        Shared/gtk/WebEventFactory.cpp
    629630

  • trunk/Source/WebKit/PlatformWPE.cmake

    r230385 r230429  
    1515add_definitions(-DWEBKIT2_COMPILATION)
    1616
    17 add_definitions(-DLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
     17add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
    1818add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
    1919

  • trunk/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp

    r230428 r230429  
    3030#include <WebCore/FileSystem.h>
    3131#include <glib.h>
     32#include <wtf/glib/GLibUtilities.h>
    3233
    33 #if ENABLE(DEVELOPER_MODE)
    34 #include <wtf/glib/GLibUtilities.h>
    35 #endif
     34using namespace WebCore;
    3635
    3736namespace WebKit {
    38 using namespace WebCore;
    3937
    4038#if ENABLE(DEVELOPER_MODE)
    … …  
    4442    if (!executablePath.isNull())
    4543        return FileSystem::directoryName(FileSystem::stringFromFileSystemRepresentation(executablePath.data()));
    46     return String();
     44    return { };
    4745}
    4846#endif
    … …  
    7169String executablePathOfWebProcess()
    7270{
     71#if PLATFORM(WPE)
     72    return findWebKitProcess("WPEWebProcess");
     73#else
    7374    return findWebKitProcess("WebKitWebProcess");
     75#endif
    7476}
    7577
    7678String executablePathOfPluginProcess()
    7779{
     80#if PLATFORM(WPE)
     81    return findWebKitProcess("WPEPluginProcess");
     82#else
    7883    return findWebKitProcess("WebKitPluginProcess");
     84#endif
    7985}
    8086
    8187String executablePathOfNetworkProcess()
    8288{
     89#if PLATFORM(WPE)
     90    return findWebKitProcess("WPENetworkProcess");
     91#else
    8392    return findWebKitProcess("WebKitNetworkProcess");
     93#endif
    8494}
    8595
    8696String executablePathOfStorageProcess()
    8797{
     98#if PLATFORM(WPE)
     99    return findWebKitProcess("WPEStorageProcess");
     100#else
    88101    return findWebKitProcess("WebKitStorageProcess");
     102#endif
    89103}
    90104

  • trunk/Source/WebKit/SourcesGTK.txt

    r230152 r230429  
    8585Shared/cairo/ShareableBitmapCairo.cpp @no-unify
    8686
     87Shared/glib/ProcessExecutablePathGLib.cpp @no-unify
    8788Shared/glib/WebContextMenuItemGlib.cpp
    8889
    … …  
    9394Shared/gtk/NativeWebWheelEventGtk.cpp
    9495Shared/gtk/PrintInfoGtk.cpp
    95 Shared/gtk/ProcessExecutablePathGtk.cpp @no-unify
    9696Shared/gtk/WebErrorsGtk.cpp
    9797Shared/gtk/WebEventFactory.cpp

  • trunk/Source/WebKit/SourcesWPE.txt

    r229973 r230429  
    7575Shared/cairo/ShareableBitmapCairo.cpp
    7676
     77Shared/glib/ProcessExecutablePathGLib.cpp
    7778Shared/glib/WebContextMenuItemGlib.cpp
    7879
    … …  
    8889Shared/wpe/NativeWebTouchEventWPE.cpp
    8990Shared/wpe/NativeWebWheelEventWPE.cpp
    90 Shared/wpe/ProcessExecutablePathWPE.cpp
    9191Shared/wpe/WebEventFactory.cpp
    9292

  • trunk/Source/cmake/OptionsCommon.cmake

    r229155 r230429  
    108108endif ()
    109109
    110 # GTK uses the GNU installation directories as defaults.
    111 if (NOT PORT STREQUAL "GTK")
     110# GTK and WPE use the GNU installation directories as defaults.
     111if (NOT PORT STREQUAL "GTK" AND NOT PORT STREQUAL "WPE")
    112112    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Absolute path to library installation directory")
    113113    set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Absolute path to executable installation directory")

  • trunk/Source/cmake/OptionsWPE.cmake

    r230375 r230429  
    66
    77CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 1 0 0)
     8
     9# These are shared variables, but we special case their definition so that we can use the
     10# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
     11set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
     12set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
     13set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
    814
    915WEBKIT_OPTION_BEGIN()
Note: See TracChangeset for help on using the changeset viewer.