Changeset 162536 in webkit
- Timestamp:
- Jan 22, 2014 11:00:48 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r162427 r162536 1 2014-01-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK][CMake] Add support for building the NetworkProcess 4 https://bugs.webkit.org/show_bug.cgi?id=127195 5 6 Reviewed by Daniel Bates. 7 8 * Source/cmake/OptionsGTK.cmake: Turn on the network process and give it 9 a name like the WebProcess. 10 1 11 2014-01-20 Ryuan Choi <ryuan.choi@samsung.com> 2 12 -
trunk/Source/WebKit2/CMakeLists.txt
r162271 r162536 675 675 ) 676 676 677 set(NetworkProcess_LIBRARIES 678 WebKit2 679 ) 680 677 681 set(WebKit2_LIBRARIES 678 682 JavaScriptCore … … 714 718 endif () 715 719 720 if (ENABLE_NETWORK_PROCESS) 721 add_executable(NetworkProcess ${NetworkProcess_SOURCES}) 722 target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES}) 723 set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit") 724 install(TARGETS NetworkProcess DESTINATION "${LIBEXEC_INSTALL_DIR}") 725 726 if (WebKit2_NetworkProcess_OUTPUT_NAME) 727 set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME}) 728 endif () 729 endif () 730 716 731 POPULATE_LIBRARY_VERSION(WEBKIT2) 717 732 set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR}) -
trunk/Source/WebKit2/ChangeLog
r162533 r162536 1 2014-01-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK][CMake] Add support for building the NetworkProcess 4 https://bugs.webkit.org/show_bug.cgi?id=127195 5 6 Reviewed by Daniel Bates. 7 8 * CMakeLists.txt: Add shared network process build instructions. 9 * PlatformEfl.cmake: Move build instructions to the platform-independent file. 10 * PlatformGTK.cmake: Add some files to the source lists. 11 1 12 2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com> 2 13 -
trunk/Source/WebKit2/PlatformEfl.cmake
r161525 r162536 401 401 endif () # ENABLE_PLUGIN_PROCESS 402 402 403 if (ENABLE_NETWORK_PROCESS)404 set(NetworkProcess_EXECUTABLE_NAME NetworkProcess)405 list(APPEND NetworkProcess_INCLUDE_DIRECTORIES406 "${WEBKIT2_DIR}/NetworkProcess"407 )408 409 include_directories(${NetworkProcess_INCLUDE_DIRECTORIES})410 411 list(APPEND NetworkProcess_SOURCES412 ${WEBKIT2_DIR}/unix/NetworkMainUnix.cpp413 )414 415 set(NetworkProcess_LIBRARIES416 WebKit2417 )418 419 add_executable(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_SOURCES})420 target_link_libraries(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_LIBRARIES})421 install(TARGETS ${NetworkProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")422 endif ()423 424 403 include_directories(${THIRDPARTY_DIR}/gtest/include) 425 404 -
trunk/Source/WebKit2/PlatformGTK.cmake
r162449 r162536 18 18 ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp 19 19 ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp 20 21 NetworkProcess/soup/NetworkProcessSoup.cpp 22 NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp 23 NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 24 25 NetworkProcess/unix/NetworkProcessMainUnix.cpp 20 26 21 27 Platform/IPC/unix/AttachmentUnix.cpp … … 261 267 UIProcess/gtk/WebProcessProxyGtk.cpp 262 268 269 UIProcess/Network/soup/NetworkProcessProxySoup.cpp 270 UIProcess/soup/WebContextSoup.cpp 263 271 UIProcess/soup/WebCookieManagerProxySoup.cpp 264 272 UIProcess/soup/WebSoupRequestManagerClient.cpp … … 397 405 "${WEBKIT2_DIR}/Shared/gtk" 398 406 "${WEBKIT2_DIR}/Shared/soup" 407 "${WEBKIT2_DIR}/NetworkProcess/unix" 399 408 "${WEBKIT2_DIR}/UIProcess/API/C/cairo" 400 409 "${WEBKIT2_DIR}/UIProcess/API/C/gtk" … … 430 439 list(APPEND WebProcess_SOURCES 431 440 gtk/MainGtk.cpp 441 ) 442 443 list(APPEND NetworkProcess_SOURCES 444 unix/NetworkMainUnix.cpp 432 445 ) 433 446 -
trunk/Source/cmake/OptionsGTK.cmake
r161528 r162536 75 75 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF) 76 76 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON) 77 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON) 77 78 WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF) 78 79 … … 120 121 set(WebKit2_OUTPUT_NAME webkit2gtk-3.0) 121 122 set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess) 123 set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess) 122 124 123 125 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
Note: See TracChangeset
for help on using the changeset viewer.