Changeset 260738 in webkit


Ignore:
Timestamp:
Apr 26, 2020 10:07:40 PM (4 years ago)
Author:
yoshiaki.jitsukawa@sony.com
Message:

[PlayStation] Enable TestWTF and TestWebCore
https://bugs.webkit.org/show_bug.cgi?id=208849

Reviewed by Don Olmstead.

.:

  • Source/cmake/OptionsPlayStation.cmake:
  • Add PLAYSTATION_COPY_SHARED_LIBRARIES() to install dependencies.
  • Add -g option for "Release" configuration.
  • Drop "RelWithDebInfo" and "MinSizeRel" configuration.

Source/WebCore:

  • PlatformPlayStation.cmake:

Add WebCore_CopySharedLibs to install dependencies.

Source/WTF:

  • wtf/PlatformPlayStation.cmake:

Add WTF_CopySharedLibs() to install dependencies.

Tools:

  • TestWebKitAPI/PlatformPlayStation.cmake:
  • TestWebKitAPI/playstation/main.cpp: Added.

(main): Load runtime libraries.

Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r260680 r260738  
     12020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
     2
     3        [PlayStation] Enable TestWTF and TestWebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=208849
     5
     6        Reviewed by Don Olmstead.
     7
     8        * Source/cmake/OptionsPlayStation.cmake:
     9        - Add PLAYSTATION_COPY_SHARED_LIBRARIES() to install dependencies.
     10        - Add -g option for "Release" configuration.
     11        - Drop "RelWithDebInfo" and "MinSizeRel" configuration.
     12
    1132020-04-24  Michael Catanzaro  <mcatanzaro@gnome.org>
    214
  • trunk/Source/WTF/ChangeLog

    r260731 r260738  
     12020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
     2
     3        [PlayStation] Enable TestWTF and TestWebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=208849
     5
     6        Reviewed by Don Olmstead.
     7
     8        * wtf/PlatformPlayStation.cmake:
     9        Add WTF_CopySharedLibs() to install dependencies.
     10
    1112020-04-26  Yusuke Suzuki  <ysuzuki@apple.com>
    212
  • trunk/Source/WTF/wtf/PlatformPlayStation.cmake

    r256731 r260738  
    2424)
    2525
     26PLAYSTATION_COPY_SHARED_LIBRARIES(WTF_CopySharedLibs
     27    FILES
     28        ${ICU_LIBRARIES}
     29)
     30
    2631# bmalloc is compiled as an OBJECT library so it is statically linked
    2732list(APPEND WTF_PRIVATE_DEFINITIONS STATICALLY_LINKED_WITH_bmalloc)
  • trunk/Source/WebCore/ChangeLog

    r260736 r260738  
     12020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
     2
     3        [PlayStation] Enable TestWTF and TestWebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=208849
     5
     6        Reviewed by Don Olmstead.
     7
     8        * PlatformPlayStation.cmake:
     9        Add WebCore_CopySharedLibs to install dependencies.
     10
    1112020-04-26  Said Abou-Hallawa  <sabouhallawa@apple.com>
    212
  • trunk/Source/WebCore/PlatformPlayStation.cmake

    r257053 r260738  
    8787    WPE::libwpe
    8888)
     89
     90PLAYSTATION_COPY_SHARED_LIBRARIES(WebCore_CopySharedLibs
     91    FILES
     92        ${CURL_LIBRARIES}
     93        ${Cairo_LIBRARIES}
     94        ${EGL_LIBRARIES}
     95        ${FREETYPE_LIBRARIES}
     96        ${Fontconfig_LIBRARIES}
     97        ${HarfBuzz_LIBRARIES}
     98        ${JPEG_LIBRARIES}
     99        ${OPENSSL_LIBRARIES}
     100        ${PNG_LIBRARIES}
     101        ${WebP_LIBRARIES}
     102)
  • trunk/Source/cmake/OptionsPlayStation.cmake

    r260672 r260738  
    11set(PORT PlayStation)
     2
     3string(APPEND CMAKE_C_FLAGS_RELEASE " -g")
     4string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g")
     5set(CMAKE_CONFIGURATION_TYPES "Debug" "Release")
    26
    37include(Sign)
     
    216220    endif ()
    217221endmacro()
     222
     223function(PLAYSTATION_COPY_SHARED_LIBRARIES target_name)
     224    set(oneValueArgs PREFIX DESTINATION)
     225    set(multiValueArgs FILES)
     226    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     227    if (opt_PREFIX)
     228        set(prefix ${opt_PREFIX})
     229    else ()
     230        set(prefix ${WEBKIT_LIBRARIES_DIR})
     231    endif ()
     232    if (opt_DESTINATION)
     233        set(destination ${opt_DESTINATION})
     234    else ()
     235        set(destination ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     236    endif ()
     237
     238    set(stub_libs)
     239    list(REMOVE_DUPLICATES opt_FILES)
     240    foreach (file IN LISTS opt_FILES)
     241        if (NOT ${file} MATCHES ".*_stub_weak.a")
     242            continue()
     243        endif ()
     244        file(RELATIVE_PATH _relative ${prefix} ${file})
     245        if (NOT ${_relative} MATCHES "^\.\./.*")
     246            get_filename_component(lib ${file} NAME)
     247            list(APPEND stub_libs ${lib})
     248        endif ()
     249    endforeach ()
     250
     251    set(dst_shared_libs)
     252    foreach (lib IN LISTS stub_libs)
     253        string(REPLACE "_stub_weak.a" ".sprx" shared_lib ${lib})
     254        set(src_file "${prefix}/bin/${shared_lib}")
     255        if (NOT EXISTS ${src_file})
     256            continue()
     257        endif ()
     258        set(dst_file "${destination}/${shared_lib}")
     259        add_custom_command(OUTPUT ${dst_file}
     260            COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
     261            MAIN_DEPENDENCY ${file}
     262            VERBATIM
     263        )
     264        list(APPEND dst_shared_libs ${dst_file})
     265    endforeach ()
     266    add_custom_target(${target_name} ALL DEPENDS ${dst_shared_libs})
     267endfunction()
  • trunk/Tools/ChangeLog

    r260734 r260738  
     12020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
     2
     3        [PlayStation] Enable TestWTF and TestWebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=208849
     5
     6        Reviewed by Don Olmstead.
     7
     8        * TestWebKitAPI/PlatformPlayStation.cmake:
     9        * TestWebKitAPI/playstation/main.cpp: Added.
     10        (main): Load runtime libraries.
     11
    1122020-04-26  Yusuke Suzuki  <ysuzuki@apple.com>
    213
  • trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake

    r260387 r260738  
    22
    33set(test_main_SOURCES
    4     generic/main.cpp
     4    playstation/main.cpp
    55)
    66
     
    5050    )
    5151endif ()
     52
     53
     54# Set the debugger working directory for Visual Studio
     55if (${CMAKE_GENERATOR} MATCHES "Visual Studio")
     56    set_target_properties(TestWTF TestWebCore TestWebKit PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
     57endif ()
Note: See TracChangeset for help on using the changeset viewer.