Changeset 162536 in webkit


Ignore:
Timestamp:
Jan 22, 2014 11:00:48 AM (10 years ago)
Author:
Martin Robinson
Message:

[GTK][CMake] Add support for building the NetworkProcess
​https://bugs.webkit.org/show_bug.cgi?id=127195

Reviewed by Daniel Bates.

.:

  • Source/cmake/OptionsGTK.cmake: Turn on the network process and give it

a name like the WebProcess.

Source/WebKit2:

  • CMakeLists.txt: Add shared network process build instructions.
  • PlatformEfl.cmake: Move build instructions to the platform-independent file.
  • PlatformGTK.cmake: Add some files to the source lists.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r162427 r162536  
     12014-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
    1112014-01-20  Ryuan Choi  <ryuan.choi@samsung.com>
    212

  • trunk/Source/WebKit2/CMakeLists.txt

    r162271 r162536  
    675675)
    676676
     677set(NetworkProcess_LIBRARIES
     678    WebKit2
     679)
     680
    677681set(WebKit2_LIBRARIES
    678682    JavaScriptCore
    … …  
    714718endif ()
    715719
     720if (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 ()
     729endif ()
     730
    716731POPULATE_LIBRARY_VERSION(WEBKIT2)
    717732set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})

  • trunk/Source/WebKit2/ChangeLog

    r162533 r162536  
     12014-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
    1122014-01-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r161525 r162536  
    401401endif () # ENABLE_PLUGIN_PROCESS
    402402
    403 if (ENABLE_NETWORK_PROCESS)
    404     set(NetworkProcess_EXECUTABLE_NAME NetworkProcess)
    405     list(APPEND NetworkProcess_INCLUDE_DIRECTORIES
    406         "${WEBKIT2_DIR}/NetworkProcess"
    407     )
    408 
    409     include_directories(${NetworkProcess_INCLUDE_DIRECTORIES})
    410 
    411     list(APPEND NetworkProcess_SOURCES
    412         ${WEBKIT2_DIR}/unix/NetworkMainUnix.cpp
    413     )
    414 
    415     set(NetworkProcess_LIBRARIES
    416         WebKit2
    417     )
    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 
    424403include_directories(${THIRDPARTY_DIR}/gtest/include)
    425404

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r162449 r162536  
    1818    ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
    1919    ${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
    2026
    2127    Platform/IPC/unix/AttachmentUnix.cpp
    … …  
    261267    UIProcess/gtk/WebProcessProxyGtk.cpp
    262268
     269    UIProcess/Network/soup/NetworkProcessProxySoup.cpp
     270    UIProcess/soup/WebContextSoup.cpp
    263271    UIProcess/soup/WebCookieManagerProxySoup.cpp
    264272    UIProcess/soup/WebSoupRequestManagerClient.cpp
    … …  
    397405    "${WEBKIT2_DIR}/Shared/gtk"
    398406    "${WEBKIT2_DIR}/Shared/soup"
     407    "${WEBKIT2_DIR}/NetworkProcess/unix"
    399408    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
    400409    "${WEBKIT2_DIR}/UIProcess/API/C/gtk"
    … …  
    430439list(APPEND WebProcess_SOURCES
    431440    gtk/MainGtk.cpp
     441)
     442
     443list(APPEND NetworkProcess_SOURCES
     444    unix/NetworkMainUnix.cpp
    432445)
    433446

  • trunk/Source/cmake/OptionsGTK.cmake

    r161528 r162536  
    7575WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
    7676WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
     77WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
    7778WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
    7879
    … …  
    120121set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
    121122set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
     123set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    122124
    123125set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
Note: See TracChangeset for help on using the changeset viewer.