Progress towards CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Mar 2015 02:57:54 +0000 (02:57 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Mar 2015 02:57:54 +0000 (02:57 +0000)
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.

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

15 files changed:
CMakeLists.txt
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/PlatformMac.cmake [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebKit/CMakeLists.txt [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformMac.cmake [new file with mode: 0644]
Source/bmalloc/CMakeLists.txt
Source/bmalloc/ChangeLog
Source/bmalloc/PlatformMac.cmake [new file with mode: 0644]
Source/cmake/OptionsMac.cmake

index c0df2cf..0a962e3 100644 (file)
@@ -132,6 +132,7 @@ else ()
     set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 
     set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 
+set(WebKit_LIBRARY_TYPE SHARED)
 set(WebKit2_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 set(WebKit2_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
index a75a780..e5f678f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
         [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
 2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
index b9ccf2d..5c35f3c 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         Object allocation sinking phase shouldn't re-decorate previously sunken allocations on each fixpoint operation
 2015-03-13  Filip Pizlo  <fpizlo@apple.com>
 
         Object allocation sinking phase shouldn't re-decorate previously sunken allocations on each fixpoint operation
index d511be1..ef4c818 100644 (file)
@@ -24,3 +24,17 @@ list(APPEND JavaScriptCore_SOURCES
     inspector/remote/RemoteInspectorXPCConnection.mm
 )
 add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
     inspector/remote/RemoteInspectorXPCConnection.mm
 )
 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
+)
diff --git a/Source/PlatformMac.cmake b/Source/PlatformMac.cmake
new file mode 100644 (file)
index 0000000..676edfc
--- /dev/null
@@ -0,0 +1 @@
+# FIXME: Put platform-specific things here
index 7819566..059d62b 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         Unreviewed, rolling out r181483.
 2015-03-13  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r181483.
index eef9147..529a370 100644 (file)
@@ -18,12 +18,16 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/cg"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/mac"
     "${WEBCORE_DIR}/platform/graphics/cg"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/mac"
+    "${WEBCORE_DIR}/platform/mac"
     "${WEBCORE_DIR}/platform/network/cocoa"
     "${WEBCORE_DIR}/platform/network/cf"
     "${WEBCORE_DIR}/platform/network/mac"
     "${WEBCORE_DIR}/platform/text/cf"
     "${WEBCORE_DIR}/platform/text/mac"
     "${WEBCORE_DIR}/platform/network/cocoa"
     "${WEBCORE_DIR}/platform/network/cf"
     "${WEBCORE_DIR}/platform/network/mac"
     "${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"
 
     "/usr/include/libxslt"
     "${WEBCORE_DIR}/plugins/mac"
 
     "/usr/include/libxslt"
@@ -93,9 +97,7 @@ list(APPEND WebCore_SOURCES
 
     platform/graphics/opentype/OpenTypeMathData.cpp
 
 
     platform/graphics/opentype/OpenTypeMathData.cpp
 
-    platform/mac/AxisScrollSnapAnimator.mm
     platform/mac/BlockExceptions.mm
     platform/mac/BlockExceptions.mm
-    platform/mac/ContentFilterMac.mm
     platform/mac/ContextMenuItemMac.mm
     platform/mac/ContextMenuMac.mm
     platform/mac/CursorMac.mm
     platform/mac/ContextMenuItemMac.mm
     platform/mac/ContextMenuMac.mm
     platform/mac/CursorMac.mm
@@ -109,10 +111,8 @@ list(APPEND WebCore_SOURCES
     platform/mac/KillRingMac.mm
     platform/mac/Language.mm
     platform/mac/LocalCurrentGraphicsContext.mm
     platform/mac/KillRingMac.mm
     platform/mac/Language.mm
     platform/mac/LocalCurrentGraphicsContext.mm
-    platform/mac/LocalizedStringsMac.cpp
     platform/mac/LoggingMac.mm
     platform/mac/MIMETypeRegistryMac.mm
     platform/mac/LoggingMac.mm
     platform/mac/MIMETypeRegistryMac.mm
-    platform/mac/MediaTimeMac.cpp
     platform/mac/NSScrollerImpDetails.mm
     platform/mac/PasteboardMac.mm
     platform/mac/PlatformClockCA.cpp
     platform/mac/NSScrollerImpDetails.mm
     platform/mac/PasteboardMac.mm
     platform/mac/PlatformClockCA.cpp
@@ -123,10 +123,8 @@ list(APPEND WebCore_SOURCES
     platform/mac/PlatformSpeechSynthesisMac.mm
     platform/mac/PlatformSpeechSynthesizerMac.mm
     platform/mac/PublicSuffixMac.mm
     platform/mac/PlatformSpeechSynthesisMac.mm
     platform/mac/PlatformSpeechSynthesizerMac.mm
     platform/mac/PublicSuffixMac.mm
-    platform/mac/PurgeableBufferMac.cpp
     platform/mac/SSLKeyGeneratorMac.cpp
     platform/mac/ScrollAnimatorMac.mm
     platform/mac/SSLKeyGeneratorMac.cpp
     platform/mac/ScrollAnimatorMac.mm
-    platform/mac/ScrollController.mm
     platform/mac/ScrollViewMac.mm
     platform/mac/ScrollbarThemeMac.mm
     platform/mac/SerializedPlatformRepresentationMac.mm
     platform/mac/ScrollViewMac.mm
     platform/mac/ScrollbarThemeMac.mm
     platform/mac/SerializedPlatformRepresentationMac.mm
@@ -216,6 +214,7 @@ set(WebCore_FORWARDING_HEADERS_FILES
     platform/DisplaySleepDisabler.h
     platform/mac/SoftLinking.h
     platform/network/cf/ResourceResponse.h
     platform/DisplaySleepDisabler.h
     platform/mac/SoftLinking.h
     platform/network/cf/ResourceResponse.h
+    platform/spi/cg/CoreGraphicsSPI.h
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9a32b6e
--- /dev/null
@@ -0,0 +1,30 @@
+# FIXME: Put Windows and Mac build files here.
+
+set(WebKit_SOURCES
+)
+
+set(WebKit_INCLUDE_DIRECTORIES
+)
+
+set(WebKit_LIBRARIES
+    JavaScriptCore
+    WTF
+    WebCore
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+include_directories(${WebKit_INCLUDE_DIRECTORIES})
+add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
+add_dependencies(WebKit WebCore)
+target_link_libraries(WebKit ${WebKit_LIBRARIES})
+set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
+set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+if (WebKit_OUTPUT_NAME)
+    set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
+endif ()
+
+POPULATE_LIBRARY_VERSION(WEBKIT)
+set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
+install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
\ No newline at end of file
index 6d3b8b9..1f63247 100644 (file)
@@ -1,3 +1,12 @@
+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>
 
         Silence non-fatal errors about failing to create WebKitPluginHost.app and WebKitPluginAgent symlinks.
 2015-03-01  Dan Bernstein  <mitz@apple.com>
 
         Silence non-fatal errors about failing to create WebKitPluginHost.app and WebKitPluginAgent symlinks.
index 524701d..60f574e 100644 (file)
@@ -1,3 +1,12 @@
+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>
 
         Unreviewed, rolling out r181483.
 2015-03-13  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r181483.
diff --git a/Source/WebKit2/PlatformMac.cmake b/Source/WebKit2/PlatformMac.cmake
new file mode 100644 (file)
index 0000000..46c2366
--- /dev/null
@@ -0,0 +1,8 @@
+#FIXME: Add Mac-specific sources here.
+
+set(WEBKIT2_EXTRA_DEPENDENCIES
+     WebKit2-forwarding-headers
+)
+set(WebProcess_SOURCES
+     WebProcess/mac/SecItemShimLibrary.mm
+)
index 9a10b84..b712aeb 100644 (file)
@@ -16,6 +16,8 @@ set(bmalloc_SOURCES
     bmalloc/mbmalloc.cpp
 )
 
     bmalloc/mbmalloc.cpp
 )
 
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
 WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
 include_directories(${bmalloc_INCLUDE_DIRECTORIES})
 add_library(bmalloc STATIC ${bmalloc_SOURCES})
 WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
 include_directories(${bmalloc_INCLUDE_DIRECTORIES})
 add_library(bmalloc STATIC ${bmalloc_SOURCES})
index 994bad2..fe443a5 100644 (file)
@@ -1,3 +1,14 @@
+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>
 
         Assertion failure in bmalloc::LargeObject::validateSelf on Mavericks Debug layout test bot
 2015-03-12  Geoffrey Garen  <ggaren@apple.com>
 
         Assertion failure in bmalloc::LargeObject::validateSelf on Mavericks Debug layout test bot
diff --git a/Source/bmalloc/PlatformMac.cmake b/Source/bmalloc/PlatformMac.cmake
new file mode 100644 (file)
index 0000000..8f6cc36
--- /dev/null
@@ -0,0 +1,3 @@
+list(APPEND bmalloc_SOURCES
+    bmalloc/Zone.cpp
+)
\ No newline at end of file
index 58df210..52238d9 100644 (file)
@@ -35,7 +35,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DASHBOARD_SUPPORT_macosx ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT OFF)
 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_DATALIST_ELEMENT OFF)
 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)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphoneos ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphonesimulator ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
@@ -173,6 +172,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphoneos ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator ON)
 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_TOUCH_EVENTS_iphonesimulator ON)
 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)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE ON)
@@ -194,6 +194,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
 
 # FIXME: These are turned off temporarily to get CMake working easier. 
 # https://bugs.webkit.org/show_bug.cgi?id=135856
 
 # 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)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
@@ -215,4 +216,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
 
 WEBKIT_OPTION_END()
 
 
 WEBKIT_OPTION_END()
 
+set(ENABLE_WEBKIT ON)
+set(ENABLE_WEBKIT2 ON)
 set(WTF_USE_UDIS86 1)
 set(WTF_USE_UDIS86 1)