Diff
Modified: trunk/CMakeLists.txt (181495 => 181496)
--- trunk/CMakeLists.txt 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
@@ -132,6 +132,7 @@
set(WebCore_LIBRARY_TYPE STATIC)
endif ()
+set(WebKit_LIBRARY_TYPE SHARED)
set(WebKit2_LIBRARY_TYPE SHARED)
set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
Modified: trunk/ChangeLog (181495 => 181496)
--- trunk/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,15 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[GTK] Add an option to enable MiniBrowser for non developer builds and always install it
Modified: trunk/Source/_javascript_Core/ChangeLog (181495 => 181496)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,13 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Object allocation sinking phase shouldn't re-decorate previously sunken allocations on each fixpoint operation
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (181495 => 181496)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -24,3 +24,17 @@
inspector/remote/RemoteInspectorXPCConnection.mm
)
add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+ DEPENDS ${_javascript_CORE_DIR}/runtime/Tracing.d
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+ COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${_javascript_CORE_DIR}/runtime/Tracing.d";
+ VERBATIM)
+
+list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${_javascript_CORE_DIR}/disassembler/udis86
+)
+list(APPEND _javascript_Core_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+)
Added: trunk/Source/PlatformMac.cmake (0 => 181496)
--- trunk/Source/PlatformMac.cmake (rev 0)
+++ trunk/Source/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -0,0 +1 @@
+# FIXME: Put platform-specific things here
Modified: trunk/Source/WebCore/ChangeLog (181495 => 181496)
--- trunk/Source/WebCore/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebCore/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,13 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r181483.
Modified: trunk/Source/WebCore/PlatformMac.cmake (181495 => 181496)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -18,12 +18,16 @@
"${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/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"
@@ -93,9 +97,7 @@
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
platform/mac/CursorMac.mm
@@ -109,10 +111,8 @@
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/MediaTimeMac.cpp
platform/mac/NSScrollerImpDetails.mm
platform/mac/PasteboardMac.mm
platform/mac/PlatformClockCA.cpp
@@ -123,10 +123,8 @@
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/ScrollController.mm
platform/mac/ScrollViewMac.mm
platform/mac/ScrollbarThemeMac.mm
platform/mac/SerializedPlatformRepresentationMac.mm
@@ -216,6 +214,7 @@
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})
Added: trunk/Source/WebKit/CMakeLists.txt (0 => 181496)
--- trunk/Source/WebKit/CMakeLists.txt (rev 0)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
@@ -0,0 +1,30 @@
+# FIXME: Put Windows and Mac build files here.
+
+set(WebKit_SOURCES
+)
+
+set(WebKit_INCLUDE_DIRECTORIES
+)
+
+set(WebKit_LIBRARIES
+ _javascript_Core
+ 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
Modified: trunk/Source/WebKit/ChangeLog (181495 => 181496)
--- trunk/Source/WebKit/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebKit/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,12 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Silence non-fatal errors about failing to create WebKitPluginHost.app and WebKitPluginAgent symlinks.
Modified: trunk/Source/WebKit2/ChangeLog (181495 => 181496)
--- trunk/Source/WebKit2/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,12 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r181483.
Added: trunk/Source/WebKit2/PlatformMac.cmake (0 => 181496)
--- trunk/Source/WebKit2/PlatformMac.cmake (rev 0)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -0,0 +1,8 @@
+#FIXME: Add Mac-specific sources here.
+
+set(WEBKIT2_EXTRA_DEPENDENCIES
+ WebKit2-forwarding-headers
+)
+set(WebProcess_SOURCES
+ WebProcess/mac/SecItemShimLibrary.mm
+)
Modified: trunk/Source/bmalloc/CMakeLists.txt (181495 => 181496)
--- trunk/Source/bmalloc/CMakeLists.txt 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/bmalloc/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
@@ -16,6 +16,8 @@
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})
Modified: trunk/Source/bmalloc/ChangeLog (181495 => 181496)
--- trunk/Source/bmalloc/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/bmalloc/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
@@ -1,3 +1,14 @@
+2015-03-13 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Assertion failure in bmalloc::LargeObject::validateSelf on Mavericks Debug layout test bot
Added: trunk/Source/bmalloc/PlatformMac.cmake (0 => 181496)
--- trunk/Source/bmalloc/PlatformMac.cmake (rev 0)
+++ trunk/Source/bmalloc/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -0,0 +1,3 @@
+list(APPEND bmalloc_SOURCES
+ bmalloc/Zone.cpp
+)
\ No newline at end of file
Modified: trunk/Source/cmake/OptionsMac.cmake (181495 => 181496)
--- trunk/Source/cmake/OptionsMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
@@ -35,7 +35,6 @@
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)
@@ -173,6 +172,7 @@
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)
@@ -194,6 +194,7 @@
# 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)
@@ -215,4 +216,6 @@
WEBKIT_OPTION_END()
+set(ENABLE_WEBKIT ON)
+set(ENABLE_WEBKIT2 ON)
set(WTF_USE_UDIS86 1)
