Changeset 260844 in webkit


Ignore:
Timestamp:
Apr 28, 2020 1:59:00 PM (4 years ago)
Author:
chris.reid@sony.com
Message:

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

Reviewed by Fujii Hironori.

.:

Add ENABLE_WEBINSPECTORUI so the resource copy can be disabled
on platforms without inspector frontends.

  • CMakeLists.txt:
  • Source/CMakeLists.txt:
  • Source/PlatformWin.cmake:
  • Source/cmake/OptionsJSCOnly.cmake:
  • Source/cmake/OptionsPlayStation.cmake:

Source/WebCore:

  • CMakeLists.txt:

Source/WebInspectorUI:

Add CMake files for copying inspector resources

  • CMakeLists.txt: Added.
  • PlatformGTK.cmake: Added.
  • PlatformWin.cmake: Added.

Source/WebKit:

Move CMake logic for the inspector resource copy script to
Source/WebInspectorUI so it can be shared with Win and other platforms.

  • InspectorGResources.cmake:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:
Location:
trunk
Files:
3 added
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

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

  • trunk/ChangeLog

    r260821 r260844  
     12020-04-28  Christopher Reid  <chris.reid@sony.com>
     2
     3        [Win] Bundle Inspector Resources in Release builds
     4        https://bugs.webkit.org/show_bug.cgi?id=210942
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Add ENABLE_WEBINSPECTORUI so the resource copy can be disabled
     9        on platforms without inspector frontends.
     10
     11        * CMakeLists.txt:
     12        * Source/CMakeLists.txt:
     13        * Source/PlatformWin.cmake:
     14        * Source/cmake/OptionsJSCOnly.cmake:
     15        * Source/cmake/OptionsPlayStation.cmake:
     16
    1172020-04-28  Philippe Normand  <pnormand@igalia.com>
    218

  • trunk/Source/CMakeLists.txt

    r260743 r260844  
    3030endif ()
    3131
     32if (ENABLE_WEBINSPECTORUI)
     33    add_subdirectory(WebInspectorUI)
     34endif ()
     35
    3236if (ENABLE_WEBCORE)
    3337    add_subdirectory(WebCore)

  • trunk/Source/PlatformWin.cmake

    r260743 r260844  
    1 set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
    2 set(WEB_INSPECTOR_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/WebInspectorUI)
    3 
    4 add_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 
    131if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt)
    142    add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser)

  • trunk/Source/WebCore/CMakeLists.txt

    r260743 r260844  
    18871887list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
    18881888
     1889if (ENABLE_WEBINSPECTORUI)
     1890    list(APPEND WebCore_DEPENDENCIES WebInspectorUI)
     1891endif ()
     1892
    18891893GENERATE_BINDINGS(WebCoreTestSupportBindings
    18901894    OUTPUT_SOURCE WebCoreTestSupport_SOURCES

  • trunk/Source/WebCore/ChangeLog

    r260843 r260844  
     12020-04-28  Christopher Reid  <chris.reid@sony.com>
     2
     3        [Win] Bundle Inspector Resources in Release builds
     4        https://bugs.webkit.org/show_bug.cgi?id=210942
     5
     6        Reviewed by Fujii Hironori.
     7
     8        * CMakeLists.txt:
     9
    1102020-04-28  Rob Buis  <rbuis@igalia.com>
    211

  • trunk/Source/WebInspectorUI/ChangeLog

    r260839 r260844  
     12020-04-28  Christopher Reid  <chris.reid@sony.com>
     2
     3        [Win] Bundle Inspector Resources in Release builds
     4        https://bugs.webkit.org/show_bug.cgi?id=210942
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Add CMake files for copying inspector resources
     9
     10        * CMakeLists.txt: Added.
     11        * PlatformGTK.cmake: Added.
     12        * PlatformWin.cmake: Added.
     13
    1142020-04-28  Nikita Vasilyev  <nvasilyev@apple.com>
    215

  • trunk/Source/WebKit/ChangeLog

    r260842 r260844  
     12020-04-28  Christopher Reid  <chris.reid@sony.com>
     2
     3        [Win] Bundle Inspector Resources in Release builds
     4        https://bugs.webkit.org/show_bug.cgi?id=210942
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Move CMake logic for the inspector resource copy script to
     9        Source/WebInspectorUI so it can be shared with Win and other platforms.
     10
     11        * InspectorGResources.cmake:
     12        * PlatformWPE.cmake:
     13        * PlatformWin.cmake:
     14
    1152020-04-28  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebKit/InspectorGResources.cmake

    r260743 r260844  
    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 
    762    add_custom_command(
    773        OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml
    78         DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
     4        DEPENDS WebInspectorUI
    795                ${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py
    806        COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py --input=${_derived_sources_dir}/InspectorResources --output=${_derived_sources_dir}/InspectorGResourceBundle.xml

  • trunk/Source/WebKit/PlatformFTW.cmake

    r259560 r260844  
    8989    WebProcess/win/WebProcessMainWin.cpp
    9090    WebProcess/win/WebProcessWin.cpp
    91 )
    92 
    93 # DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
    94 # expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
    95 add_custom_command(
    96     OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
    97     DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
    98     COMMAND cp ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
    9991)
    10092

  • trunk/Source/WebKit/PlatformWPE.cmake

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

  • trunk/Source/WebKit/PlatformWin.cmake

    r260743 r260844  
    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/.
    94 add_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
    9890)
    9991

  • trunk/Source/cmake/OptionsJSCOnly.cmake

    r260743 r260844  
    3636set(ENABLE_WEBKIT_LEGACY OFF)
    3737set(ENABLE_WEBKIT OFF)
     38set(ENABLE_WEBINSPECTORUI OFF)
    3839
    3940if (WIN32)

  • trunk/Source/cmake/OptionsPlayStation.cmake

    r260743 r260844  
    1616set(ENABLE_WEBKIT ON CACHE BOOL "Build WebKit")
    1717set(ENABLE_WEBKIT_LEGACY OFF)
     18set(ENABLE_WEBINSPECTORUI OFF)
    1819
    1920if (NOT ENABLE_WEBCORE)

  • trunk/Source/cmake/WebKitFS.cmake

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