Changeset 181496 in webkit

Timestamp:

Mar 13, 2015, 7:57:54 PM (11 years ago)

Author:

achristensen@apple.com

Message:

Progress towards CMake on Mac.
​https://bugs.webkit.org/show_bug.cgi?id=142680

Reviewed by Gyuyoung Kim.

.:

• CMakeLists.txt:
• Source/PlatformMac.cmake: Added stub.
• Source/cmake/OptionsMac.cmake:

Change defines to get CMake working.

Source/bmalloc:

• CMakeLists.txt:
• PlatformMac.cmake:

Added Zone.cpp to Mac CMake builds.

Source/JavaScriptCore:

• PlatformMac.cmake:

Generate TracingDtrace.h based on project.pbxproj.

Source/WebCore:

• PlatformMac.cmake:

Added new include directories and removed old source files.

Source/WebKit:

• CMakeLists.txt: Added.

Source/WebKit2:

• PlatformMac.cmake: Added.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformMac.cmake (modified) (1 diff)
• Source/PlatformMac.cmake (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformMac.cmake (modified) (6 diffs)
• Source/WebKit/CMakeLists.txt (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformMac.cmake (added)
• Source/bmalloc/CMakeLists.txt (modified) (1 diff)
• Source/bmalloc/ChangeLog (modified) (1 diff)
• Source/bmalloc/PlatformMac.cmake (added)
• Source/cmake/OptionsMac.cmake (modified) (4 diffs)

trunk/CMakeLists.txt

@@ -133 +133 @@
 endif ()
 
+set(WebKit_LIBRARY_TYPE SHARED)
 set(WebKit2_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE STATIC)

trunk/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt:
+        * Source/PlatformMac.cmake: Added stub.
+        * Source/cmake/OptionsMac.cmake:
+        Change defines to get CMake working.
+
 2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformMac.cmake:
+        Generate TracingDtrace.h based on project.pbxproj.
+
 2015-03-13  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/PlatformMac.cmake

@@ -25 +25 @@
 )
 add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+
+add_custom_command(
+    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+    DEPENDS ${JAVASCRIPTCORE_DIR}/runtime/Tracing.d
+    WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+    COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${JAVASCRIPTCORE_DIR}/runtime/Tracing.d";
+    VERBATIM)
+
+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+    ${JAVASCRIPTCORE_DIR}/disassembler/udis86
+)
+list(APPEND JavaScriptCore_HEADERS
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformMac.cmake:
+        Added new include directories and removed old source files.
+
 2015-03-13  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/PlatformMac.cmake

@@ -19 +19 @@
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/mac"
+    "${WEBCORE_DIR}/platform/mac"
     "${WEBCORE_DIR}/platform/network/cocoa"
     "${WEBCORE_DIR}/platform/network/cf"
@@ -24 +25 @@
     "${WEBCORE_DIR}/platform/text/cf"
     "${WEBCORE_DIR}/platform/text/mac"
-    "${WEBCORE_DIR}/platform/mac"
+    "${WEBCORE_DIR}/platform/spi/cf"
+    "${WEBCORE_DIR}/platform/spi/cg"
+    "${WEBCORE_DIR}/platform/spi/cocoa"
+    "${WEBCORE_DIR}/platform/spi/mac"
     "${WEBCORE_DIR}/plugins/mac"
 
@@ -94 +98 @@
     platform/graphics/opentype/OpenTypeMathData.cpp
 
-    platform/mac/AxisScrollSnapAnimator.mm
     platform/mac/BlockExceptions.mm
-    platform/mac/ContentFilterMac.mm
     platform/mac/ContextMenuItemMac.mm
     platform/mac/ContextMenuMac.mm
@@ -110 +112 @@
     platform/mac/Language.mm
     platform/mac/LocalCurrentGraphicsContext.mm
-    platform/mac/LocalizedStringsMac.cpp
     platform/mac/LoggingMac.mm
     platform/mac/MIMETypeRegistryMac.mm
-    platform/mac/MediaTimeMac.cpp
     platform/mac/NSScrollerImpDetails.mm
     platform/mac/PasteboardMac.mm
@@ -124 +124 @@
     platform/mac/PlatformSpeechSynthesizerMac.mm
     platform/mac/PublicSuffixMac.mm
-    platform/mac/PurgeableBufferMac.cpp
     platform/mac/SSLKeyGeneratorMac.cpp
     platform/mac/ScrollAnimatorMac.mm
-    platform/mac/ScrollController.mm
     platform/mac/ScrollViewMac.mm
     platform/mac/ScrollbarThemeMac.mm
@@ -217 +215 @@
     platform/mac/SoftLinking.h
     platform/network/cf/ResourceResponse.h
+    platform/spi/cg/CoreGraphicsSPI.h
 )
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt: Added.
+
 2015-03-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformMac.cmake: Added.
+
 2015-03-13  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/bmalloc/CMakeLists.txt

@@ -17 +17 @@
 )
 
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
 WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
 include_directories(${bmalloc_INCLUDE_DIRECTORIES})

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2015-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=142680
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake:
+        Added Zone.cpp to Mac CMake builds.
+
 2015-03-12  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/cmake/OptionsMac.cmake

@@ -36 +36 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DETAILS_ELEMENT ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphoneos ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphonesimulator ON)
@@ -174 +173 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_ICON_LOADING OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
@@ -195 +195 @@
 # FIXME: These are turned off temporarily to get CMake working easier. 
 # https://bugs.webkit.org/show_bug.cgi?id=135856
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
@@ -216 +217 @@
 WEBKIT_OPTION_END()
 
+set(ENABLE_WEBKIT ON)
+set(ENABLE_WEBKIT2 ON)
 set(WTF_USE_UDIS86 1)