Unreviewed, reverting r260672.
authordpino@igalia.com <dpino@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Apr 2020 07:40:38 +0000 (07:40 +0000)
committerdpino@igalia.com <dpino@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Apr 2020 07:40:38 +0000 (07:40 +0000)
[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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
CMakeLists.txt
ChangeLog
Source/CMakeLists.txt
Source/PlatformWin.cmake
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebInspectorUI/CMakeLists.txt [deleted file]
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/PlatformGTK.cmake [deleted file]
Source/WebInspectorUI/PlatformWin.cmake [deleted file]
Source/WebKit/ChangeLog
Source/WebKit/InspectorGResources.cmake
Source/WebKit/PlatformWPE.cmake
Source/WebKit/PlatformWin.cmake
Source/cmake/OptionsJSCOnly.cmake
Source/cmake/OptionsPlayStation.cmake
Source/cmake/WebKitFS.cmake

index a3e3c67..9b5f7a7 100644 (file)
@@ -31,10 +31,6 @@ if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools")
     set(ENABLE_TOOLS ON)
 endif ()
 
     set(ENABLE_TOOLS ON)
 endif ()
 
-if (NOT DEFINED ENABLE_WEBINSPECTORUI)
-    set(ENABLE_WEBINSPECTORUI ON)
-endif ()
-
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
index c96c306..c53bf2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
+
+        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
+
 2020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
 
         [PlayStation] Enable TestWTF and TestWebCore
 2020-04-26  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
 
         [PlayStation] Enable TestWTF and TestWebCore
index 03c36fb..0844dff 100644 (file)
@@ -29,10 +29,6 @@ if (USE_LIBWEBRTC)
     add_subdirectory(ThirdParty/libwebrtc)
 endif ()
 
     add_subdirectory(ThirdParty/libwebrtc)
 endif ()
 
-if (ENABLE_WEBINSPECTORUI)
-    add_subdirectory(WebInspectorUI)
-endif ()
-
 if (ENABLE_WEBCORE)
     add_subdirectory(WebCore)
 endif ()
 if (ENABLE_WEBCORE)
     add_subdirectory(WebCore)
 endif ()
index 288db33..4df64fd 100644 (file)
@@ -1,3 +1,15 @@
+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 ${JavaScriptCore_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 JavaScriptCore 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 ()
 if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt)
     add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser)
 endif ()
index 7750c60..caef46a 100644 (file)
@@ -1884,7 +1884,7 @@ GENERATE_BINDINGS(WebCoreBindings
         --serviceWorkerGlobalScopeConstructorsFile ${SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
         --workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
         --paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
         --serviceWorkerGlobalScopeConstructorsFile ${SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
         --workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
         --paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
-list(APPEND WebCore_DEPENDENCIES WebCoreBindings WebInspectorUI)
+list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
 
 GENERATE_BINDINGS(WebCoreTestSupportBindings
     OUTPUT_SOURCE WebCoreTestSupport_SOURCES
 
 GENERATE_BINDINGS(WebCoreTestSupportBindings
     OUTPUT_SOURCE WebCoreTestSupport_SOURCES
index 641af96..c743bf0 100644 (file)
@@ -1,3 +1,15 @@
+2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
+
+        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
+
 2020-04-27  Kenneth Russell  <kbr@chromium.org>
 
         Build failure in WebGL2RenderingContext after r260588
 2020-04-27  Kenneth Russell  <kbr@chromium.org>
 
         Build failure in WebGL2RenderingContext after r260588
diff --git a/Source/WebInspectorUI/CMakeLists.txt b/Source/WebInspectorUI/CMakeLists.txt
deleted file mode 100644 (file)
index 6fe884d..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-
-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
-    ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
-    ${JavaScriptCore_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/JavaScriptCore/inspector/InspectorBackendCommands.js is
-# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
-add_custom_command(
-    OUTPUT ${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
-    DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
-    COMMAND ${CMAKE_COMMAND} -E copy ${JavaScriptCore_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 ${JavaScriptCore_SCRIPTS_DIR}/InspectorBackendCommands.js
-    COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${WebInspectorUI_DERIVED_SOURCES_DIR}" "SRCROOT=${WEBINSPECTORUI_DIR}" "JAVASCRIPTCORE_PRIVATE_HEADERS_DIR=${JavaScriptCore_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
-)
index 25950e8..9840f58 100644 (file)
@@ -1,5 +1,17 @@
 2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
 
 2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
 
+        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
+
+2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
+
         Unreviewed, reverting r260728.
 
         Build fix after r260672, no needed since r260672 is also being reverted.
         Unreviewed, reverting r260728.
 
         Build fix after r260672, no needed since r260672 is also being reverted.
diff --git a/Source/WebInspectorUI/PlatformGTK.cmake b/Source/WebInspectorUI/PlatformGTK.cmake
deleted file mode 100644 (file)
index b176dd3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-set(WebInspectorUI_RESOURCES_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR})
diff --git a/Source/WebInspectorUI/PlatformWin.cmake b/Source/WebInspectorUI/PlatformWin.cmake
deleted file mode 100644 (file)
index ed9ebea..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-set(WebInspectorUI_RESOURCES_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources)
-set(WebInspectorUI_LOCALIZED_STRINGS_DIR ${WebInspectorUI_RESOURCES_DIR}/WebInspectorUI)
index 2cd4930..6f78138 100644 (file)
@@ -1,5 +1,17 @@
 2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
 
 2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
 
+        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
+
+2020-04-27  Diego Pino Garcia  <dpino@igalia.com>
+
         Unreviewed, reverting r260696.
 
         Build fix after r260672, no needed since r260672 is also being reverted.
         Unreviewed, reverting r260696.
 
         Build fix after r260672, no needed since r260672 is also being reverted.
index 1169845..674b5ef 100644 (file)
@@ -1,4 +1,78 @@
 macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES _derived_sources_dir)
 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
+        ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
+        ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
+    )
+
+    # DerivedSources/JavaScriptCore/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}/JavaScriptCore/Scripts
+        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
+        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
     add_custom_command(
         OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml
         DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
index 650e535..094b2bb 100644 (file)
@@ -301,9 +301,9 @@ list(APPEND WebKit_LIBRARIES
     ${LIBSOUP_LIBRARIES}
 )
 
     ${LIBSOUP_LIBRARIES}
 )
 
-WEBKIT_BUILD_INSPECTOR_GRESOURCES(${WebInspectorUI_DERIVED_SOURCES_DIR})
+WEBKIT_BUILD_INSPECTOR_GRESOURCES(${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
 list(APPEND WPEWebInspectorResources_DERIVED_SOURCES
 list(APPEND WPEWebInspectorResources_DERIVED_SOURCES
-    ${WebInspectorUI_DERIVED_SOURCES_DIR}/InspectorGResourceBundle.c
+    ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
 )
 
 list(APPEND WPEWebInspectorResources_LIBRARIES
 )
 
 list(APPEND WPEWebInspectorResources_LIBRARIES
index a94c7e1..950de9e 100644 (file)
@@ -89,6 +89,14 @@ list(APPEND WebKit_SOURCES
     WebProcess/win/WebProcessWin.cpp
 )
 
     WebProcess/win/WebProcessWin.cpp
 )
 
+# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
+# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
+add_custom_command(
+    OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+    DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js
+    COMMAND cp ${JavaScriptCore_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"
 list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/Platform/classifier"
     "${WEBKIT_DIR}/Platform/generic"
index bf11e13..edd9e66 100644 (file)
@@ -35,7 +35,6 @@ set(EVENT_LOOP_TYPE ${DEFAULT_EVENT_LOOP_TYPE} CACHE STRING "Implementation of e
 set(ENABLE_WEBCORE OFF)
 set(ENABLE_WEBKIT_LEGACY OFF)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBCORE OFF)
 set(ENABLE_WEBKIT_LEGACY OFF)
 set(ENABLE_WEBKIT OFF)
-set(ENABLE_WEBINSPECTORUI OFF)
 
 if (WIN32)
     set(ENABLE_API_TESTS OFF)
 
 if (WIN32)
     set(ENABLE_API_TESTS OFF)
index 0ded2c7..f61cc97 100644 (file)
@@ -15,7 +15,6 @@ set(ENABLE_API_TESTS ON CACHE BOOL "Build API Tests")
 set(ENABLE_WEBCORE ON CACHE BOOL "Build WebCore")
 set(ENABLE_WEBKIT ON CACHE BOOL "Build WebKit")
 set(ENABLE_WEBKIT_LEGACY OFF)
 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)
 
 if (NOT ENABLE_WEBCORE)
     set(ENABLE_WEBKIT OFF)
index dc35a1e..3221cde 100644 (file)
@@ -28,9 +28,6 @@ endif ()
 if (NOT WEBDRIVER_DIR)
     set(WEBDRIVER_DIR "${CMAKE_SOURCE_DIR}/Source/WebDriver")
 endif ()
 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/JavaScriptCore")
 
 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")