Changeset 230429 in webkit
- Timestamp:
- Apr 9, 2018 8:45:48 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 8 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r230385 r230429 1 2018-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 1 14 2018-04-08 Fujii Hironori <Hironori.Fujii@sony.com> 2 15 -
trunk/Source/WebKit/ChangeLog
r230390 r230429 1 2018-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 1 23 2018-04-09 Michael Catanzaro <mcatanzaro@igalia.com> 2 24 -
trunk/Source/WebKit/PlatformGTK.cmake
r230385 r230429 621 621 Shared/cairo/ShareableBitmapCairo.cpp 622 622 623 Shared/glib/ProcessExecutablePathGLib.cpp 624 623 625 Shared/gtk/NativeWebKeyboardEventGtk.cpp 624 626 Shared/gtk/NativeWebMouseEventGtk.cpp 625 627 Shared/gtk/NativeWebTouchEventGtk.cpp 626 628 Shared/gtk/NativeWebWheelEventGtk.cpp 627 Shared/gtk/ProcessExecutablePathGtk.cpp628 629 Shared/gtk/WebEventFactory.cpp 629 630 -
trunk/Source/WebKit/PlatformWPE.cmake
r230385 r230429 15 15 add_definitions(-DWEBKIT2_COMPILATION) 16 16 17 add_definitions(-D LIBEXECDIR="${LIBEXEC_INSTALL_DIR}")17 add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}") 18 18 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") 19 19 -
trunk/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
r230428 r230429 30 30 #include <WebCore/FileSystem.h> 31 31 #include <glib.h> 32 #include <wtf/glib/GLibUtilities.h> 32 33 33 #if ENABLE(DEVELOPER_MODE) 34 #include <wtf/glib/GLibUtilities.h> 35 #endif 34 using namespace WebCore; 36 35 37 36 namespace WebKit { 38 using namespace WebCore;39 37 40 38 #if ENABLE(DEVELOPER_MODE) … … 44 42 if (!executablePath.isNull()) 45 43 return FileSystem::directoryName(FileSystem::stringFromFileSystemRepresentation(executablePath.data())); 46 return String();44 return { }; 47 45 } 48 46 #endif … … 71 69 String executablePathOfWebProcess() 72 70 { 71 #if PLATFORM(WPE) 72 return findWebKitProcess("WPEWebProcess"); 73 #else 73 74 return findWebKitProcess("WebKitWebProcess"); 75 #endif 74 76 } 75 77 76 78 String executablePathOfPluginProcess() 77 79 { 80 #if PLATFORM(WPE) 81 return findWebKitProcess("WPEPluginProcess"); 82 #else 78 83 return findWebKitProcess("WebKitPluginProcess"); 84 #endif 79 85 } 80 86 81 87 String executablePathOfNetworkProcess() 82 88 { 89 #if PLATFORM(WPE) 90 return findWebKitProcess("WPENetworkProcess"); 91 #else 83 92 return findWebKitProcess("WebKitNetworkProcess"); 93 #endif 84 94 } 85 95 86 96 String executablePathOfStorageProcess() 87 97 { 98 #if PLATFORM(WPE) 99 return findWebKitProcess("WPEStorageProcess"); 100 #else 88 101 return findWebKitProcess("WebKitStorageProcess"); 102 #endif 89 103 } 90 104 -
trunk/Source/WebKit/SourcesGTK.txt
r230152 r230429 85 85 Shared/cairo/ShareableBitmapCairo.cpp @no-unify 86 86 87 Shared/glib/ProcessExecutablePathGLib.cpp @no-unify 87 88 Shared/glib/WebContextMenuItemGlib.cpp 88 89 … … 93 94 Shared/gtk/NativeWebWheelEventGtk.cpp 94 95 Shared/gtk/PrintInfoGtk.cpp 95 Shared/gtk/ProcessExecutablePathGtk.cpp @no-unify96 96 Shared/gtk/WebErrorsGtk.cpp 97 97 Shared/gtk/WebEventFactory.cpp -
trunk/Source/WebKit/SourcesWPE.txt
r229973 r230429 75 75 Shared/cairo/ShareableBitmapCairo.cpp 76 76 77 Shared/glib/ProcessExecutablePathGLib.cpp 77 78 Shared/glib/WebContextMenuItemGlib.cpp 78 79 … … 88 89 Shared/wpe/NativeWebTouchEventWPE.cpp 89 90 Shared/wpe/NativeWebWheelEventWPE.cpp 90 Shared/wpe/ProcessExecutablePathWPE.cpp91 91 Shared/wpe/WebEventFactory.cpp 92 92 -
trunk/Source/cmake/OptionsCommon.cmake
r229155 r230429 108 108 endif () 109 109 110 # GTK usesthe GNU installation directories as defaults.111 if (NOT PORT STREQUAL "GTK" )110 # GTK and WPE use the GNU installation directories as defaults. 111 if (NOT PORT STREQUAL "GTK" AND NOT PORT STREQUAL "WPE") 112 112 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Absolute path to library installation directory") 113 113 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Absolute path to executable installation directory") -
trunk/Source/cmake/OptionsWPE.cmake
r230375 r230429 6 6 7 7 CALCULATE_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. 11 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory") 12 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory") 13 set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library") 8 14 9 15 WEBKIT_OPTION_BEGIN()
Note: See TracChangeset
for help on using the changeset viewer.