Diff
Modified: trunk/ChangeLog (199093 => 199094)
--- trunk/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,12 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsMac.cmake:
+
2016-04-04 Alejandro G. Castro <a...@igalia.com>
REGRESSION(r198492): [GTK] The WEB_RTC flag was not correctly added in some situations
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (199093 => 199094)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1326,10 +1326,12 @@
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
WEBKIT_FRAMEWORK(_javascript_Core)
-if (${_javascript_Core_LIBRARY_TYPE} STREQUAL "SHARED")
- POPULATE_LIBRARY_VERSION(_javascript_CORE)
- set_target_properties(_javascript_Core PROPERTIES VERSION ${_javascript_CORE_VERSION} SOVERSION ${_javascript_CORE_VERSION_MAJOR})
- install(TARGETS _javascript_Core DESTINATION "${LIB_INSTALL_DIR}")
+if (NOT APPLE)
+ if (${_javascript_Core_LIBRARY_TYPE} STREQUAL "SHARED")
+ POPULATE_LIBRARY_VERSION(_javascript_CORE)
+ set_target_properties(_javascript_Core PROPERTIES VERSION ${_javascript_CORE_VERSION} SOVERSION ${_javascript_CORE_VERSION_MAJOR})
+ install(TARGETS _javascript_Core DESTINATION "${LIB_INSTALL_DIR}")
+ endif ()
endif ()
# Force staging of shared scripts, even if they aren't directly used to build _javascript_Core.
Modified: trunk/Source/_javascript_Core/ChangeLog (199093 => 199094)
--- trunk/Source/_javascript_Core/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,12 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+
2016-04-05 Filip Pizlo <fpi...@apple.com>
Improve some other cases of context-sensitive inlining
Modified: trunk/Source/WebCore/CMakeLists.txt (199093 => 199094)
--- trunk/Source/WebCore/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
@@ -3419,8 +3419,8 @@
)
set(WebCoreTestSupport_LIBRARIES
- _javascript_Core${DEBUG_SUFFIX}
- WTF${DEBUG_SUFFIX}
+ PRIVATE _javascript_Core${DEBUG_SUFFIX}
+ PRIVATE WTF${DEBUG_SUFFIX}
)
# Modules that the bindings generator scripts may use
@@ -3814,6 +3814,10 @@
WEBKIT_FRAMEWORK(WebCore)
+if (APPLE)
+ set_target_properties(WebCore PROPERTIES LINK_FLAGS "-sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy")
+endif ()
+
if (WIN32)
add_custom_target(WebCoreDerivedSources_PreBuild COMMAND ${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND} VERBATIM)
add_dependencies(WebCoreDerivedSources WebCoreDerivedSources_PreBuild)
Modified: trunk/Source/WebCore/ChangeLog (199093 => 199094)
--- trunk/Source/WebCore/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,13 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2016-04-05 Jon Davis <j...@ingenesis.net>
Fixed CSS Shapes entry on the WebKit Feature Status page.
Modified: trunk/Source/WebCore/PlatformMac.cmake (199093 => 199094)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -926,11 +926,11 @@
${ADDITIONAL_BINDINGS_DEPENDENCIES})
set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
-list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
+list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
list(APPEND WebCoreTestSupport_SOURCES
bindings/js/JSMockContentFilterSettingsCustom.cpp
testing/Internals.mm
testing/MockContentFilter.cpp
testing/MockContentFilterSettings.cpp
-)
\ No newline at end of file
+)
Modified: trunk/Source/WebKit/CMakeLists.txt (199093 => 199094)
--- trunk/Source/WebKit/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
@@ -50,3 +50,7 @@
if (WIN32)
add_dependencies(WebKit WebKitGUID)
endif ()
+
+if (APPLE)
+ set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
+endif ()
Modified: trunk/Source/WebKit/ChangeLog (199093 => 199094)
--- trunk/Source/WebKit/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,12 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+
2016-04-01 Alex Christensen <achristen...@webkit.org>
Compile DumpRenderTree with CMake on Mac
Modified: trunk/Source/WebKit2/CMakeLists.txt (199093 => 199094)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
@@ -740,13 +740,20 @@
)
set(DatabaseProcess_LIBRARIES
- WebKit2
+ WebKit2
)
-set(WebKit2_LIBRARIES
- _javascript_Core
- WebCore
-)
+if (APPLE)
+ set(WebKit2_LIBRARIES
+ PRIVATE WebCore
+ PUBLIC _javascript_Core
+ )
+else ()
+ set(WebKit2_LIBRARIES
+ _javascript_Core
+ WebCore
+ )
+endif ()
set(PluginProcess_LIBRARIES
WebKit2
Modified: trunk/Source/WebKit2/ChangeLog (199093 => 199094)
--- trunk/Source/WebKit2/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,13 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2016-04-05 Brian Burg <bb...@apple.com>
Web Automation: add support for getting, deleting, and adding cookies
Modified: trunk/Source/WebKit2/PlatformMac.cmake (199093 => 199094)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -10,7 +10,7 @@
add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
list(APPEND WebKit2_LIBRARIES
- WebKit
+ PRIVATE WebKit
${APPLICATION_SERVICES_LIBRARY}
)
@@ -717,6 +717,8 @@
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+
set(WebKit2_OUTPUT_NAME WebKit)
add_custom_command(
Modified: trunk/Source/cmake/OptionsMac.cmake (199093 => 199094)
--- trunk/Source/cmake/OptionsMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,5 @@
+set(WEBKIT_MAC_VERSION 602.1.27)
+
WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
Modified: trunk/Tools/ChangeLog (199093 => 199094)
--- trunk/Tools/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
@@ -1,3 +1,15 @@
+2016-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformMac.cmake:
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+
2016-04-05 Youenn Fablet <youenn.fab...@crf.canon.fr>
[Fetch API] Add a runtime flag to fetch API and related constructs
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (199093 => 199094)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
@@ -15,7 +15,6 @@
_javascript_Core
WTF
WebCoreTestSupport
- WebKit
)
set(DumpRenderTree_INCLUDE_DIRECTORIES
@@ -103,7 +102,6 @@
_javascript_Core
WTF
WebCoreTestSupport
- WebKit
)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (199093 => 199094)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -3,12 +3,25 @@
find_library(CORESERVICES_LIBRARY CoreServices)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks)
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
+link_directories(../../WebKitLibraries)
+
list(APPEND TestNetscapePlugin_LIBRARIES
${QUARTZ_LIBRARY}
+ WebKit2
)
list(APPEND DumpRenderTree_LIBRARIES
${CARBON_LIBRARY}
+ ${QUARTZ_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ WebKit2
)
add_definitions("-ObjC++ -std=c++11")
@@ -82,3 +95,23 @@
mac/WebArchiveDumpSupportMac.mm
mac/WorkQueueItemMac.mm
)
+
+set(DumpRenderTree_RESOURCES
+ AHEM____.TTF
+ FontWithFeatures.otf
+ FontWithFeatures.ttf
+ WebKitWeightWatcher100.ttf
+ WebKitWeightWatcher200.ttf
+ WebKitWeightWatcher300.ttf
+ WebKitWeightWatcher400.ttf
+ WebKitWeightWatcher500.ttf
+ WebKitWeightWatcher600.ttf
+ WebKitWeightWatcher700.ttf
+ WebKitWeightWatcher800.ttf
+ WebKitWeightWatcher900.ttf
+)
+
+file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+foreach (_file ${DumpRenderTree_RESOURCES})
+ file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+endforeach ()
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (199093 => 199094)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -55,6 +55,7 @@
list(APPEND TestNetscapePlugin_LIBRARIES
Msimg32
Shlwapi
+ WebKit
)
set(ImageDiff_SOURCES
@@ -78,6 +79,7 @@
)
list(APPEND DumpRenderTree_LIBRARIES
+ WebKit
shlwapi
)
Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (199093 => 199094)
--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
@@ -21,6 +21,10 @@
libicucore.dylib
)
+list(APPEND TestWebKitAPI_LIBRARIES
+ ${CARBON_LIBRARY}
+)
+
set(bundle_harness_SOURCES
${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm
