Attachment 348422 Details for Bug 189093 – Patch

[patch] Patch

bug-189093.diff (text/plain), 3.89 KB, created by Don Olmstead on 2018-08-29 12:20:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-08-29 12:20:52 PDT

Size: 3.89 KB

patch

obsolete

>diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
>index 5f4f9e0c963..5d3236733a9 100644
>--- a/Tools/CMakeLists.txt
>+++ b/Tools/CMakeLists.txt
>@@ -1,48 +1,7 @@
> set_property(DIRECTORY . PROPERTY FOLDER "Tools")
> 
>-if ("${PORT}" STREQUAL "GTK")
>-    if (DEVELOPER_MODE)
>-      add_subdirectory(WebKitTestRunner)
>-      add_subdirectory(ImageDiff)
>-      if (ENABLE_API_TESTS)
>-          add_subdirectory(TestWebKitAPI/glib)
>-      endif ()
>-      if (ENABLE_NETSCAPE_PLUGIN_API)
>-          add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
>-      endif ()
>-    endif ()
>-
>-    if (ENABLE_MINIBROWSER)
>-        add_subdirectory(MiniBrowser/gtk)
>-    endif ()
>-elseif ("${PORT}" STREQUAL "Mac")
>-    add_subdirectory(DumpRenderTree)
>-    add_subdirectory(WebKitTestRunner)
>-    add_subdirectory(MiniBrowser/mac)
>-elseif ("${PORT}" STREQUAL "JSCOnly")
>-elseif ("${PORT}" STREQUAL "WPE")
>-    if (DEVELOPER_MODE OR ENABLE_MINIBROWSER)
>-        add_subdirectory(wpe/backends)
>-    endif ()
>-
>-    if (DEVELOPER_MODE)
>-        add_subdirectory(ImageDiff)
>-        add_subdirectory(WebKitTestRunner)
>-        if (ENABLE_API_TESTS)
>-            add_subdirectory(TestWebKitAPI/glib)
>-        endif ()
>-    endif ()
>-
>-    if (ENABLE_MINIBROWSER)
>-        add_subdirectory(MiniBrowser/wpe)
>-    endif ()
>-elseif ("${PORT}" STREQUAL "Win")
>-    add_subdirectory(DumpRenderTree)
>-    add_subdirectory(ImageDiff)
>-    if (ENABLE_WEBKIT_LEGACY)
>-        add_subdirectory(MiniBrowser/win)
>-    endif ()
>-endif ()
>+# Individual subdirectories are added in the port's cmake file
>+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
> if (ENABLE_API_TESTS)
>     add_subdirectory(TestWebKitAPI)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4a432cdddbb..f22df2233cd 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-29  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Split Tools/CMakeLists.txt into platform files
>+        https://bugs.webkit.org/show_bug.cgi?id=189093
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * PlatformGTK.cmake: Added.
>+        * PlatformMac.cmake: Added.
>+        * PlatformWPE.cmake: Added.
>+        * PlatformWin.cmake: Added.
>+
> 2018-08-28  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix 32-bit Mac build.
>diff --git a/Tools/PlatformGTK.cmake b/Tools/PlatformGTK.cmake
>new file mode 100644
>index 00000000000..e9ade7a699a
>--- /dev/null
>+++ b/Tools/PlatformGTK.cmake
>@@ -0,0 +1,16 @@
>+if (DEVELOPER_MODE)
>+    add_subdirectory(WebKitTestRunner)
>+    add_subdirectory(ImageDiff)
>+
>+    if (ENABLE_API_TESTS)
>+        add_subdirectory(TestWebKitAPI/glib)
>+    endif ()
>+
>+    if (ENABLE_NETSCAPE_PLUGIN_API)
>+        add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
>+    endif ()
>+endif ()
>+
>+if (ENABLE_MINIBROWSER)
>+  add_subdirectory(MiniBrowser/gtk)
>+endif ()
>diff --git a/Tools/PlatformMac.cmake b/Tools/PlatformMac.cmake
>new file mode 100644
>index 00000000000..924401eef4c
>--- /dev/null
>+++ b/Tools/PlatformMac.cmake
>@@ -0,0 +1,3 @@
>+add_subdirectory(DumpRenderTree)
>+add_subdirectory(WebKitTestRunner)
>+add_subdirectory(MiniBrowser/mac)
>diff --git a/Tools/PlatformWPE.cmake b/Tools/PlatformWPE.cmake
>new file mode 100644
>index 00000000000..0172e5d2bdb
>--- /dev/null
>+++ b/Tools/PlatformWPE.cmake
>@@ -0,0 +1,16 @@
>+if (DEVELOPER_MODE OR ENABLE_MINIBROWSER)
>+    add_subdirectory(wpe/backends)
>+endif ()
>+
>+if (DEVELOPER_MODE)
>+    add_subdirectory(ImageDiff)
>+    add_subdirectory(WebKitTestRunner)
>+
>+    if (ENABLE_API_TESTS)
>+        add_subdirectory(TestWebKitAPI/glib)
>+    endif ()
>+endif ()
>+
>+if (ENABLE_MINIBROWSER)
>+    add_subdirectory(MiniBrowser/wpe)
>+endif ()
>diff --git a/Tools/PlatformWin.cmake b/Tools/PlatformWin.cmake
>new file mode 100644
>index 00000000000..e4e2e7a5446
>--- /dev/null
>+++ b/Tools/PlatformWin.cmake
>@@ -0,0 +1,6 @@
>+add_subdirectory(DumpRenderTree)
>+add_subdirectory(ImageDiff)
>+
>+if (ENABLE_WEBKIT_LEGACY)
>+    add_subdirectory(MiniBrowser/win)
>+endif ()

Actions: View | Formatted Diff | Diff

Attachments on bug 189093: 348421 | 348422