Diff
Modified: trunk/CMakeLists.txt (260671 => 260672)
--- trunk/CMakeLists.txt 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/CMakeLists.txt 2020-04-24 21:45:42 UTC (rev 260672)
@@ -31,6 +31,10 @@
set(ENABLE_TOOLS ON)
endif ()
+if (NOT DEFINED ENABLE_WEBINSPECTORUI)
+ set(ENABLE_WEBINSPECTORUI ON)
+endif ()
+
# -----------------------------------------------------------------------------
# Determine which port will be built
# -----------------------------------------------------------------------------
Modified: trunk/ChangeLog (260671 => 260672)
--- trunk/ChangeLog 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/ChangeLog 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,3 +1,19 @@
+2020-04-24 Christopher Reid <[email protected]>
+
+ [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:
+
2020-04-24 Per Arne Vollan <[email protected]>
[Win] Fix AppleWin build
Modified: trunk/Source/CMakeLists.txt (260671 => 260672)
--- trunk/Source/CMakeLists.txt 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/CMakeLists.txt 2020-04-24 21:45:42 UTC (rev 260672)
@@ -29,6 +29,10 @@
add_subdirectory(ThirdParty/libwebrtc)
endif ()
+if (ENABLE_WEBINSPECTORUI)
+ add_subdirectory(WebInspectorUI)
+endif ()
+
if (ENABLE_WEBCORE)
add_subdirectory(WebCore)
endif ()
Modified: trunk/Source/PlatformWin.cmake (260671 => 260672)
--- trunk/Source/PlatformWin.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/PlatformWin.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,15 +1,3 @@
-set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
-set(WEB_INSPECTOR_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/WebInspectorUI)
-
-add_custom_target(
- web-inspector-resources ALL
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
- COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
- DEPENDS _javascript_Core WebCore
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-)
-
if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt)
add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser)
endif ()
Modified: trunk/Source/WebCore/CMakeLists.txt (260671 => 260672)
--- trunk/Source/WebCore/CMakeLists.txt 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1884,7 +1884,7 @@
--serviceWorkerGlobalScopeConstructorsFile ${SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
--workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
--paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
-list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
+list(APPEND WebCore_DEPENDENCIES WebCoreBindings WebInspectorUI)
GENERATE_BINDINGS(WebCoreTestSupportBindings
OUTPUT_SOURCE WebCoreTestSupport_SOURCES
Modified: trunk/Source/WebCore/ChangeLog (260671 => 260672)
--- trunk/Source/WebCore/ChangeLog 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebCore/ChangeLog 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,3 +1,12 @@
+2020-04-24 Christopher Reid <[email protected]>
+
+ [Win] Bundle Inspector Resources in Release builds
+ https://bugs.webkit.org/show_bug.cgi?id=210942
+
+ Reviewed by Fujii Hironori.
+
+ * CMakeLists.txt:
+
2020-04-24 Antoine Quint <[email protected]>
[Web Animations] Ensure calling Web Animations APIs override future CSS Animations style properties
Added: trunk/Source/WebInspectorUI/CMakeLists.txt (0 => 260672)
--- trunk/Source/WebInspectorUI/CMakeLists.txt (rev 0)
+++ trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-24 21:45:42 UTC (rev 260672)
@@ -0,0 +1,79 @@
+
+set(InspectorFiles
+ ${WEBINSPECTORUI_DIR}/UserInterface/*.html
+ ${WEBINSPECTORUI_DIR}/UserInterface/Base/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Controllers/*.css
+ ${WEBINSPECTORUI_DIR}/UserInterface/Controllers/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Debug/*.css
+ ${WEBINSPECTORUI_DIR}/UserInterface/Debug/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/External/CodeMirror/*.css
+ ${WEBINSPECTORUI_DIR}/UserInterface/External/CodeMirror/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/External/Esprima/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/External/three.js/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Models/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Protocol/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Proxies/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Test/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Views/*.css
+ ${WEBINSPECTORUI_DIR}/UserInterface/Views/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Workers/Formatter/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Workers/HeapSnapshot/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/Images/*.png
+ ${WEBINSPECTORUI_DIR}/UserInterface/Images/*.svg
+ ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js
+)
+
+file(GLOB InspectorFilesDependencies
+ ${InspectorFiles}
+)
+
+set(InspectorResourceScripts
+ ${WEBINSPECTORUI_DIR}/Scripts/combine-resources.pl
+ ${WEBINSPECTORUI_DIR}/Scripts/copy-user-interface-resources.pl
+ ${WEBINSPECTORUI_DIR}/Scripts/fix-worker-imports-for-optimized-builds.pl
+ ${WEBINSPECTORUI_DIR}/Scripts/remove-console-asserts.pl
+ ${_javascript_Core_SCRIPTS_DIR}/cssmin.py
+ ${_javascript_Core_SCRIPTS_DIR}/jsmin.py
+)
+
+set(WebInspectorUI_RESOURCES_DIR "${WebInspectorUI_DERIVED_SOURCES_DIR}")
+set(WebInspectorUI_LOCALIZED_STRINGS_DIR "${WebInspectorUI_RESOURCES_DIR}/InspectorResources/WebInspectorUI/Localizations/en.lproj")
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+# DerivedSources/_javascript_Core/inspector/InspectorBackendCommands.js is
+# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
+add_custom_command(
+ OUTPUT ${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ DEPENDS ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
+ COMMAND ${CMAKE_COMMAND} -E copy ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ VERBATIM
+)
+
+if (NOT DEFINED COMBINE_INSPECTOR_RESOURCES)
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set(COMBINE_INSPECTOR_RESOURCES NO)
+ else ()
+ set(COMBINE_INSPECTOR_RESOURCES YES)
+ endif ()
+endif ()
+if (NOT DEFINED COMBINE_TEST_RESOURCES)
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR DEVELOPER_MODE)
+ set(COMBINE_TEST_RESOURCES YES)
+ else ()
+ set(COMBINE_TEST_RESOURCES NO)
+ endif ()
+endif ()
+
+add_custom_target(
+ WebInspectorUI
+ DEPENDS ${InspectorFilesDependencies}
+ ${InspectorResourceScripts}
+ ${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ COMMAND ${CMAKE_COMMAND} -E copy ${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${_javascript_Core_SCRIPTS_DIR}/InspectorBackendCommands.js
+ COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${WebInspectorUI_DERIVED_SOURCES_DIR}" "SRCROOT=${WEBINSPECTORUI_DIR}" "_javascript_CORE_PRIVATE_HEADERS_DIR=${_javascript_Core_SCRIPTS_DIR}" "TARGET_BUILD_DIR=${WebInspectorUI_RESOURCES_DIR}" "UNLOCALIZED_RESOURCES_FOLDER_PATH=WebInspectorUI" "COMBINE_INSPECTOR_RESOURCES=${COMBINE_INSPECTOR_RESOURCES}" "COMBINE_TEST_RESOURCES=${COMBINE_TEST_RESOURCES}" PYTHON=${PYTHON_EXECUTABLE} ${PERL_EXECUTABLE} ${WEBINSPECTORUI_DIR}/Scripts/copy-user-interface-resources.pl
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${WebInspectorUI_LOCALIZED_STRINGS_DIR}
+ COMMAND ${CMAKE_COMMAND} -E copy "${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js" ${WebInspectorUI_LOCALIZED_STRINGS_DIR}/localizedStrings.js
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/inspector-resources.stamp
+ VERBATIM
+)
Modified: trunk/Source/WebInspectorUI/ChangeLog (260671 => 260672)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,3 +1,16 @@
+2020-04-24 Christopher Reid <[email protected]>
+
+ [Win] Bundle Inspector Resources in Release builds
+ https://bugs.webkit.org/show_bug.cgi?id=210942
+
+ Reviewed by Fujii Hironori.
+
+ Add CMake files for copying inspector resources
+
+ * CMakeLists.txt: Added.
+ * PlatformGTK.cmake: Added.
+ * PlatformWin.cmake: Added.
+
2020-04-23 Devin Rousso <[email protected]>
Web Inspector: REGRESSION(r257759): Network: waterfall popover is missing bars
Added: trunk/Source/WebInspectorUI/PlatformGTK.cmake (0 => 260672)
--- trunk/Source/WebInspectorUI/PlatformGTK.cmake (rev 0)
+++ trunk/Source/WebInspectorUI/PlatformGTK.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -0,0 +1 @@
+set(WebInspectorUI_RESOURCES_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR})
Added: trunk/Source/WebInspectorUI/PlatformWin.cmake (0 => 260672)
--- trunk/Source/WebInspectorUI/PlatformWin.cmake (rev 0)
+++ trunk/Source/WebInspectorUI/PlatformWin.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -0,0 +1,2 @@
+set(WebInspectorUI_RESOURCES_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources)
+set(WebInspectorUI_LOCALIZED_STRINGS_DIR ${WebInspectorUI_RESOURCES_DIR}/WebInspectorUI)
Modified: trunk/Source/WebKit/ChangeLog (260671 => 260672)
--- trunk/Source/WebKit/ChangeLog 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebKit/ChangeLog 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,3 +1,17 @@
+2020-04-24 Christopher Reid <[email protected]>
+
+ [Win] Bundle Inspector Resources in Release builds
+ https://bugs.webkit.org/show_bug.cgi?id=210942
+
+ Reviewed by Fujii Hironori.
+
+ 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:
+
2020-04-24 Kate Cheney <[email protected]>
Removing website data for a domain should delete corresponding ITP entry
Modified: trunk/Source/WebKit/InspectorGResources.cmake (260671 => 260672)
--- trunk/Source/WebKit/InspectorGResources.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebKit/InspectorGResources.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -1,79 +1,5 @@
macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES _derived_sources_dir)
- set(InspectorFiles
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/Esprima/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/three.js/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Proxies/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Test/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/Formatter/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.png
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.svg
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
- )
-
- file(GLOB InspectorFilesDependencies
- ${InspectorFiles}
- )
-
- set(InspectorResourceScripts
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/combine-resources.pl
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/fix-worker-imports-for-optimized-builds.pl
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/remove-console-asserts.pl
- ${_javascript_Core_SCRIPTS_DIR}/cssmin.py
- ${_javascript_Core_SCRIPTS_DIR}/jsmin.py
- )
-
- # DerivedSources/_javascript_Core/inspector/InspectorBackendCommands.js is
- # expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
- COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- VERBATIM
- )
-
- if (NOT DEFINED COMBINE_INSPECTOR_RESOURCES)
- if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- set(COMBINE_INSPECTOR_RESOURCES NO)
- else ()
- set(COMBINE_INSPECTOR_RESOURCES YES)
- endif ()
- endif ()
- if (NOT DEFINED COMBINE_TEST_RESOURCES)
- if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR DEVELOPER_MODE)
- set(COMBINE_TEST_RESOURCES YES)
- else ()
- set(COMBINE_TEST_RESOURCES NO)
- endif ()
- endif ()
-
- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/inspector-resources.stamp
- DEPENDS ${InspectorFilesDependencies}
- ${InspectorResourceScripts}
- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- COMMAND cp ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${FORWARDING_HEADERS_DIR}/_javascript_Core/Scripts
- COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}" "SRCROOT=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI" "_javascript_CORE_PRIVATE_HEADERS_DIR=${FORWARDING_HEADERS_DIR}/_javascript_Core/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
- COMMAND mkdir -p ${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj
- COMMAND cp ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js ${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
- COMMAND touch ${CMAKE_BINARY_DIR}/inspector-resources.stamp
- VERBATIM
- )
-
- add_custom_command(
OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml
DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py
Modified: trunk/Source/WebKit/PlatformWPE.cmake (260671 => 260672)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -301,9 +301,9 @@
${LIBSOUP_LIBRARIES}
)
-WEBKIT_BUILD_INSPECTOR_GRESOURCES(${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
+WEBKIT_BUILD_INSPECTOR_GRESOURCES(${WebInspectorUI_DERIVED_SOURCES_DIR})
list(APPEND WPEWebInspectorResources_DERIVED_SOURCES
- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
+ ${WebInspectorUI_DERIVED_SOURCES_DIR}/InspectorGResourceBundle.c
)
list(APPEND WPEWebInspectorResources_LIBRARIES
Modified: trunk/Source/WebKit/PlatformWin.cmake (260671 => 260672)
--- trunk/Source/WebKit/PlatformWin.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/WebKit/PlatformWin.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -89,14 +89,6 @@
WebProcess/win/WebProcessWin.cpp
)
-# DerivedSources/_javascript_Core/inspector/InspectorBackendCommands.js is
-# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- DEPENDS ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
- COMMAND cp ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
-)
-
list(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/Platform/classifier"
"${WEBKIT_DIR}/Platform/generic"
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (260671 => 260672)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -35,6 +35,7 @@
set(ENABLE_WEBCORE OFF)
set(ENABLE_WEBKIT_LEGACY OFF)
set(ENABLE_WEBKIT OFF)
+set(ENABLE_WEBINSPECTORUI OFF)
if (WIN32)
set(ENABLE_API_TESTS OFF)
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (260671 => 260672)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -11,6 +11,7 @@
set(ENABLE_WEBCORE ON CACHE BOOL "Build WebCore")
set(ENABLE_WEBKIT ON CACHE BOOL "Build WebKit")
set(ENABLE_WEBKIT_LEGACY OFF)
+set(ENABLE_WEBINSPECTORUI OFF)
if (NOT ENABLE_WEBCORE)
set(ENABLE_WEBKIT OFF)
Modified: trunk/Source/cmake/WebKitFS.cmake (260671 => 260672)
--- trunk/Source/cmake/WebKitFS.cmake 2020-04-24 21:42:50 UTC (rev 260671)
+++ trunk/Source/cmake/WebKitFS.cmake 2020-04-24 21:45:42 UTC (rev 260672)
@@ -28,6 +28,9 @@
if (NOT WEBDRIVER_DIR)
set(WEBDRIVER_DIR "${CMAKE_SOURCE_DIR}/Source/WebDriver")
endif ()
+if (NOT WEBINSPECTORUI_DIR)
+ set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
+endif ()
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
