[Win] Bundle Inspector Resources in Release builds
authorchris.reid@sony.com <chris.reid@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Apr 2020 20:59:00 +0000 (20:59 +0000)
committerchris.reid@sony.com <chris.reid@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Apr 2020 20:59:00 +0000 (20:59 +0000)
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:

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

18 files changed:
CMakeLists.txt
ChangeLog
Source/CMakeLists.txt
Source/PlatformWin.cmake
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebInspectorUI/CMakeLists.txt [new file with mode: 0644]
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/PlatformGTK.cmake [new file with mode: 0644]
Source/WebInspectorUI/PlatformWin.cmake [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/InspectorGResources.cmake
Source/WebKit/PlatformFTW.cmake
Source/WebKit/PlatformWPE.cmake
Source/WebKit/PlatformWin.cmake
Source/cmake/OptionsJSCOnly.cmake
Source/cmake/OptionsPlayStation.cmake
Source/cmake/WebKitFS.cmake

index 9b5f7a7..a3e3c67 100644 (file)
@@ -31,6 +31,10 @@ if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools")
     set(ENABLE_TOOLS ON)
 endif ()
 
+if (NOT DEFINED ENABLE_WEBINSPECTORUI)
+    set(ENABLE_WEBINSPECTORUI ON)
+endif ()
+
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
index b166a56..364d5a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2020-04-28  Christopher Reid  <chris.reid@sony.com>
+
+        [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-28  Philippe Normand  <pnormand@igalia.com>
 
         [GStreamer][MediaStream] Doesn't build with GStreamer 1.10
index 0844dff..03c36fb 100644 (file)
@@ -29,6 +29,10 @@ if (USE_LIBWEBRTC)
     add_subdirectory(ThirdParty/libwebrtc)
 endif ()
 
+if (ENABLE_WEBINSPECTORUI)
+    add_subdirectory(WebInspectorUI)
+endif ()
+
 if (ENABLE_WEBCORE)
     add_subdirectory(WebCore)
 endif ()
index 4df64fd..288db33 100644 (file)
@@ -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 ${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 ()
index caef46a..35d0cce 100644 (file)
@@ -1886,6 +1886,10 @@ GENERATE_BINDINGS(WebCoreBindings
         --paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
 list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
 
+if (ENABLE_WEBINSPECTORUI)
+    list(APPEND WebCore_DEPENDENCIES WebInspectorUI)
+endif ()
+
 GENERATE_BINDINGS(WebCoreTestSupportBindings
     OUTPUT_SOURCE WebCoreTestSupport_SOURCES
     INPUT_FILES ${WebCoreTestSupport_IDL_FILES}
index b5b3c1b..1fc9dfe 100644 (file)
@@ -1,3 +1,12 @@
+2020-04-28  Christopher Reid  <chris.reid@sony.com>
+
+        [Win] Bundle Inspector Resources in Release builds
+        https://bugs.webkit.org/show_bug.cgi?id=210942
+
+        Reviewed by Fujii Hironori.
+
+        * CMakeLists.txt:
+
 2020-04-28  Rob Buis  <rbuis@igalia.com>
 
         Remove downloadAttribute from DocumentLoader
diff --git a/Source/WebInspectorUI/CMakeLists.txt b/Source/WebInspectorUI/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cf8e40e
--- /dev/null
@@ -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
+    ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
+    ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
+)
+
+set(WebInspectorUI_RESOURCES_DIR "${WebInspectorUI_DERIVED_SOURCES_DIR}/InspectorResources")
+set(WebInspectorUI_LOCALIZED_STRINGS_DIR "${WebInspectorUI_RESOURCES_DIR}/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
+            ${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
+    VERBATIM
+)
index 9603642..cc32c93 100644 (file)
@@ -1,3 +1,16 @@
+2020-04-28  Christopher Reid  <chris.reid@sony.com>
+
+        [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-28  Nikita Vasilyev  <nvasilyev@apple.com>
 
         Web Inspector: Elements: Classes toggle button has wrong outline on focus
diff --git a/Source/WebInspectorUI/PlatformGTK.cmake b/Source/WebInspectorUI/PlatformGTK.cmake
new file mode 100644 (file)
index 0000000..62e2749
--- /dev/null
@@ -0,0 +1,3 @@
+set(WebInspectorUI_RESOURCES_DIR "${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorResources")
+set(WebInspectorUI_LOCALIZED_STRINGS_DIR "${WebInspectorUI_RESOURCES_DIR}/WebInspectorUI/Localizations/en.lproj")
+
diff --git a/Source/WebInspectorUI/PlatformWin.cmake b/Source/WebInspectorUI/PlatformWin.cmake
new file mode 100644 (file)
index 0000000..beaf47b
--- /dev/null
@@ -0,0 +1,2 @@
+set(WebInspectorUI_RESOURCES_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources")
+set(WebInspectorUI_LOCALIZED_STRINGS_DIR "${WebInspectorUI_RESOURCES_DIR}/WebInspectorUI")
index 200cc78..52e819b 100644 (file)
@@ -1,3 +1,17 @@
+2020-04-28  Christopher Reid  <chris.reid@sony.com>
+
+        [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-28  David Kilzer  <ddkilzer@apple.com>
 
         [MacCatalyst] Add missing symlinks to WebKit.frameworks
index 674b5ef..c471ecd 100644 (file)
@@ -1,81 +1,7 @@
 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
+        DEPENDS WebInspectorUI
                 ${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py
         COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py --input=${_derived_sources_dir}/InspectorResources --output=${_derived_sources_dir}/InspectorGResourceBundle.xml
         VERBATIM
index ce03bde..570a661 100644 (file)
@@ -90,14 +90,6 @@ list(APPEND WebKit_SOURCES
     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}/PluginProcess/win"
index 094b2bb..650e535 100644 (file)
@@ -301,9 +301,9 @@ list(APPEND WebKit_LIBRARIES
     ${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
index 950de9e..a94c7e1 100644 (file)
@@ -89,14 +89,6 @@ list(APPEND WebKit_SOURCES
     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"
index edd9e66..bf11e13 100644 (file)
@@ -35,6 +35,7 @@ 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_WEBINSPECTORUI OFF)
 
 if (WIN32)
     set(ENABLE_API_TESTS OFF)
index f61cc97..0ded2c7 100644 (file)
@@ -15,6 +15,7 @@ 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_WEBINSPECTORUI OFF)
 
 if (NOT ENABLE_WEBCORE)
     set(ENABLE_WEBKIT OFF)
index 3221cde..dc35a1e 100644 (file)
@@ -28,6 +28,9 @@ 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")