Changeset 260743 in webkit


Ignore:
Timestamp:
Apr 27, 2020 12:40:38 AM (4 years ago)
Author:
Diego Pino Garcia
Message:

Unreviewed, reverting r260672.

[GTK] WebInspector tests are timing out after r260672

Reverted changeset:

"[Win] Bundle Inspector Resources in Release builds"
​https://bugs.webkit.org/show_bug.cgi?id=210942
​https://trac.webkit.org/changeset/260672

Location:
trunk
Files:
3 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r260672 r260743  
    3030if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools")
    3131    set(ENABLE_TOOLS ON)
    32 endif ()
    33 
    34 if (NOT DEFINED ENABLE_WEBINSPECTORUI)
    35     set(ENABLE_WEBINSPECTORUI ON)
    3632endif ()
    3733

  • trunk/ChangeLog

    r260738 r260743  
     12020-04-27  Diego Pino Garcia  <dpino@igalia.com>
     2
     3        Unreviewed, reverting r260672.
     4
     5        [GTK] WebInspector tests are timing out after r260672
     6
     7        Reverted changeset:
     8
     9        "[Win] Bundle Inspector Resources in Release builds"
     10        https://bugs.webkit.org/show_bug.cgi?id=210942
     11        https://trac.webkit.org/changeset/260672
     12
    1132020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
    214

  • trunk/Source/CMakeLists.txt

    r260672 r260743  
    3030endif ()
    3131
    32 if (ENABLE_WEBINSPECTORUI)
    33     add_subdirectory(WebInspectorUI)
    34 endif ()
    35 
    3632if (ENABLE_WEBCORE)
    3733    add_subdirectory(WebCore)

  • trunk/Source/PlatformWin.cmake

    r260672 r260743  
     1set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
     2set(WEB_INSPECTOR_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/WebInspectorUI)
     3
     4add_custom_target(
     5    web-inspector-resources ALL
     6    COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
     7    COMMAND ${CMAKE_COMMAND} -E copy ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
     8    COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
     9    DEPENDS JavaScriptCore WebCore
     10    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     11)
     12
    113if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt)
    214    add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser)

  • trunk/Source/WebCore/CMakeLists.txt

    r260672 r260743  
    18851885        --workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
    18861886        --paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
    1887 list(APPEND WebCore_DEPENDENCIES WebCoreBindings WebInspectorUI)
     1887list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
    18881888
    18891889GENERATE_BINDINGS(WebCoreTestSupportBindings

  • trunk/Source/WebCore/ChangeLog

    r260740 r260743  
     12020-04-27  Diego Pino Garcia  <dpino@igalia.com>
     2
     3        Unreviewed, reverting r260672.
     4
     5        [GTK] WebInspector tests are timing out after r260672
     6
     7        Reverted changeset:
     8
     9        "[Win] Bundle Inspector Resources in Release builds"
     10        https://bugs.webkit.org/show_bug.cgi?id=210942
     11        https://trac.webkit.org/changeset/260672
     12
    1132020-04-27  Kenneth Russell  <kbr@chromium.org>
    214

  • trunk/Source/WebInspectorUI/ChangeLog

    r260742 r260743  
     12020-04-27  Diego Pino Garcia  <dpino@igalia.com>
     2
     3        Unreviewed, reverting r260672.
     4
     5        [GTK] WebInspector tests are timing out after r260672
     6
     7        Reverted changeset:
     8
     9        "[Win] Bundle Inspector Resources in Release builds"
     10        https://bugs.webkit.org/show_bug.cgi?id=210942
     11        https://trac.webkit.org/changeset/260672
     12
    1132020-04-27  Diego Pino Garcia  <dpino@igalia.com>
    214

  • trunk/Source/WebKit/ChangeLog

    r260741 r260743  
     12020-04-27  Diego Pino Garcia  <dpino@igalia.com>
     2
     3        Unreviewed, reverting r260672.
     4
     5        [GTK] WebInspector tests are timing out after r260672
     6
     7        Reverted changeset:
     8
     9        "[Win] Bundle Inspector Resources in Release builds"
     10        https://bugs.webkit.org/show_bug.cgi?id=210942
     11        https://trac.webkit.org/changeset/260672
     12
    1132020-04-27  Diego Pino Garcia  <dpino@igalia.com>
    214

  • trunk/Source/WebKit/InspectorGResources.cmake

    r260741 r260743  
    11macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES _derived_sources_dir)
     2    set(InspectorFiles
     3        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
     4        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
     5        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
     6        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
     7        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.css
     8        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.js
     9        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
     10        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
     11        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/Esprima/*.js
     12        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/three.js/*.js
     13        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
     14        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
     15        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Proxies/*.js
     16        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Test/*.js
     17        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
     18        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
     19        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/Formatter/*.js
     20        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/*.js
     21        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.png
     22        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.svg
     23        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
     24    )
     25
     26    file(GLOB InspectorFilesDependencies
     27        ${InspectorFiles}
     28    )
     29
     30    set(InspectorResourceScripts
     31        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/combine-resources.pl
     32        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
     33        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/fix-worker-imports-for-optimized-builds.pl
     34        ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/remove-console-asserts.pl
     35        ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
     36        ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
     37    )
     38
     39    # DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
     40    # expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
     41    add_custom_command(
     42        OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     43        DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
     44        COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     45        VERBATIM
     46    )
     47
     48    if (NOT DEFINED COMBINE_INSPECTOR_RESOURCES)
     49        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     50            set(COMBINE_INSPECTOR_RESOURCES NO)
     51        else ()
     52            set(COMBINE_INSPECTOR_RESOURCES YES)
     53        endif ()
     54    endif ()
     55    if (NOT DEFINED COMBINE_TEST_RESOURCES)
     56        if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR DEVELOPER_MODE)
     57            set(COMBINE_TEST_RESOURCES YES)
     58        else ()
     59            set(COMBINE_TEST_RESOURCES NO)
     60        endif ()
     61    endif ()
     62
     63    add_custom_command(
     64        OUTPUT ${CMAKE_BINARY_DIR}/inspector-resources.stamp
     65        DEPENDS ${InspectorFilesDependencies}
     66                ${InspectorResourceScripts}
     67                ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     68        COMMAND cp ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts
     69        COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}" "SRCROOT=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI" "JAVASCRIPTCORE_PRIVATE_HEADERS_DIR=${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts" "TARGET_BUILD_DIR=${_derived_sources_dir}/InspectorResources" "UNLOCALIZED_RESOURCES_FOLDER_PATH=WebInspectorUI" "COMBINE_INSPECTOR_RESOURCES=${COMBINE_INSPECTOR_RESOURCES}" "COMBINE_TEST_RESOURCES=${COMBINE_TEST_RESOURCES}" PYTHON=${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
     70        COMMAND mkdir -p ${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj
     71        COMMAND cp ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js ${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
     72        COMMAND touch ${CMAKE_BINARY_DIR}/inspector-resources.stamp
     73        VERBATIM
     74    )
     75
    276    add_custom_command(
    377        OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml

  • trunk/Source/WebKit/PlatformWPE.cmake

    r260672 r260743  
    302302)
    303303
    304 WEBKIT_BUILD_INSPECTOR_GRESOURCES(${WebInspectorUI_DERIVED_SOURCES_DIR})
     304WEBKIT_BUILD_INSPECTOR_GRESOURCES(${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
    305305list(APPEND WPEWebInspectorResources_DERIVED_SOURCES
    306     ${WebInspectorUI_DERIVED_SOURCES_DIR}/InspectorGResourceBundle.c
     306    ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
    307307)
    308308

  • trunk/Source/WebKit/PlatformWin.cmake

    r260672 r260743  
    8888    WebProcess/win/WebProcessMainWin.cpp
    8989    WebProcess/win/WebProcessWin.cpp
     90)
     91
     92# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
     93# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
     94add_custom_command(
     95    OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     96    DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
     97    COMMAND cp ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
    9098)
    9199

  • trunk/Source/cmake/OptionsJSCOnly.cmake

    r260672 r260743  
    3636set(ENABLE_WEBKIT_LEGACY OFF)
    3737set(ENABLE_WEBKIT OFF)
    38 set(ENABLE_WEBINSPECTORUI OFF)
    3938
    4039if (WIN32)

  • trunk/Source/cmake/OptionsPlayStation.cmake

    r260738 r260743  
    1616set(ENABLE_WEBKIT ON CACHE BOOL "Build WebKit")
    1717set(ENABLE_WEBKIT_LEGACY OFF)
    18 set(ENABLE_WEBINSPECTORUI OFF)
    1918
    2019if (NOT ENABLE_WEBCORE)

  • trunk/Source/cmake/WebKitFS.cmake

    r260672 r260743  
    2828if (NOT WEBDRIVER_DIR)
    2929    set(WEBDRIVER_DIR "${CMAKE_SOURCE_DIR}/Source/WebDriver")
    30 endif ()
    31 if (NOT WEBINSPECTORUI_DIR)
    32     set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
    3330endif ()
    3431
Note: See TracChangeset for help on using the changeset viewer.