- Revision
- 222452
- Author
- [email protected]
- Date
- 2017-09-25 12:03:00 -0700 (Mon, 25 Sep 2017)
Log Message
Make progress on getting Mac CMake building again
https://bugs.webkit.org/show_bug.cgi?id=177443
Unreviewed, just "fixing" the build.
.:
* Source/cmake/OptionsMac.cmake:
Turn on WEB_CRYPTO on Mac. We need to do a bigger cleanup of feature
defines, but this one is important because we have SUBTLE_CRYPTO on
and there is some amount of interdependency.
Source/WebCore:
* PlatformMac.cmake:
Add some missing files and include paths.
Source/WebCore/PAL:
* pal/PlatformMac.cmake:
Add some missing files and include paths.
Source/WebKit:
* PlatformMac.cmake:
Add some missing files and include paths.
Source/WebKitLegacy:
* PlatformMac.cmake:
Set up dependencies correctly for our mig-generated files.
MAIN_DEPENDENCY is for VS, not what it sounds like.
Add mig-generated files to WebKitLegacy, not WebKit (I think this was
missed in the WebKit2 rename).
Modified Paths
Diff
Modified: trunk/ChangeLog (222451 => 222452)
--- trunk/ChangeLog 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,3 +1,15 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Make progress on getting Mac CMake building again
+ https://bugs.webkit.org/show_bug.cgi?id=177443
+
+ Unreviewed, just "fixing" the build.
+
+ * Source/cmake/OptionsMac.cmake:
+ Turn on WEB_CRYPTO on Mac. We need to do a bigger cleanup of feature
+ defines, but this one is important because we have SUBTLE_CRYPTO on
+ and there is some amount of interdependency.
+
2017-09-22 Per Arne Vollan <[email protected]>
[Win] WebKit is built as a static library, and not as a dll.
Modified: trunk/Source/WebCore/ChangeLog (222451 => 222452)
--- trunk/Source/WebCore/ChangeLog 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebCore/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,3 +1,13 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Make progress on getting Mac CMake building again
+ https://bugs.webkit.org/show_bug.cgi?id=177443
+
+ Unreviewed, just "fixing" the build.
+
+ * PlatformMac.cmake:
+ Add some missing files and include paths.
+
2017-09-25 Ms2ger <[email protected]>
Update waitSync and the TIMEOUT_IGNORED constant to use signed integers.
Modified: trunk/Source/WebCore/PAL/ChangeLog (222451 => 222452)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,3 +1,13 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Make progress on getting Mac CMake building again
+ https://bugs.webkit.org/show_bug.cgi?id=177443
+
+ Unreviewed, just "fixing" the build.
+
+ * pal/PlatformMac.cmake:
+ Add some missing files and include paths.
+
2017-09-22 Zalan Bujtas <[email protected]>
WeakPtrFactory should populate m_ref lazily.
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (222451 => 222452)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,4 +1,8 @@
list(APPEND PAL_SOURCES
+ avfoundation/MediaTimeAVFoundation.cpp
+
+ cf/CoreMediaSoftLink.cpp
+
crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
system/cocoa/SleepDisablerCocoa.cpp
@@ -11,3 +15,9 @@
text/mac/KillRingMac.mm
)
+
+list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
+ "${PAL_DIR}/pal/cf"
+ "${PAL_DIR}/pal/spi/cf"
+ "${PAL_DIR}/pal/spi/mac"
+)
Modified: trunk/Source/WebCore/PlatformMac.cmake (222451 => 222452)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-09-25 19:03:00 UTC (rev 222452)
@@ -207,6 +207,8 @@
editing/cocoa/DataDetection.mm
editing/cocoa/EditorCocoa.mm
editing/cocoa/HTMLConverter.mm
+ editing/cocoa/WebArchiveResourceFromNSAttributedString.mm
+ editing/cocoa/WebArchiveResourceWebResourceHandler.mm
editing/cocoa/WebContentReaderCocoa.mm
editing/mac/AlternativeTextUIController.mm
@@ -342,7 +344,6 @@
platform/graphics/avfoundation/MediaPlaybackTargetMac.mm
platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
- platform/graphics/avfoundation/MediaTimeAVFoundation.cpp
platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm
@@ -352,6 +353,7 @@
platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm
+ platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm
platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm
platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Modified: trunk/Source/WebKit/ChangeLog (222451 => 222452)
--- trunk/Source/WebKit/ChangeLog 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebKit/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,3 +1,13 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Make progress on getting Mac CMake building again
+ https://bugs.webkit.org/show_bug.cgi?id=177443
+
+ Unreviewed, just "fixing" the build.
+
+ * PlatformMac.cmake:
+ Add some missing files and include paths.
+
2017-09-24 Michael Catanzaro <[email protected]>
Viewport fit is no longer experimental
Modified: trunk/Source/WebKit/PlatformMac.cmake (222451 => 222452)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-09-25 19:03:00 UTC (rev 222452)
@@ -405,6 +405,7 @@
"${WEBKIT_DIR}/Platform/cg"
"${WEBKIT_DIR}/Platform/classifier"
"${WEBKIT_DIR}/Platform/classifier/cocoa"
+ "${WEBKIT_DIR}/Platform/cocoa"
"${WEBKIT_DIR}/Platform/mac"
"${WEBKIT_DIR}/Platform/unix"
"${WEBKIT_DIR}/Platform/spi/Cocoa"
@@ -467,6 +468,8 @@
add_definitions("-include WebKit2Prefix.h")
set(WebKit_FORWARDING_HEADERS_FILES
+ Platform/cocoa/WKCrashReporter.h
+
Shared/API/c/WKDiagnosticLoggingResultType.h
UIProcess/API/C/WKPageDiagnosticLoggingClient.h
Modified: trunk/Source/WebKitLegacy/ChangeLog (222451 => 222452)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
@@ -1,3 +1,17 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Make progress on getting Mac CMake building again
+ https://bugs.webkit.org/show_bug.cgi?id=177443
+
+ Unreviewed, just "fixing" the build.
+
+ * PlatformMac.cmake:
+ Set up dependencies correctly for our mig-generated files.
+ MAIN_DEPENDENCY is for VS, not what it sounds like.
+
+ Add mig-generated files to WebKitLegacy, not WebKit (I think this was
+ missed in the WebKit2 rename).
+
2017-09-21 Per Arne Vollan <[email protected]>
[Win] Compile error, generate-webkitversion.pl script not found.
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (222451 => 222452)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-09-25 19:03:00 UTC (rev 222452)
@@ -421,7 +421,7 @@
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
- MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+ DEPENDS mac/Plugins/Hosted/WebKitPluginAgent.defs mac/Plugins/Hosted/WebKitPluginHost.defs
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
COMMAND mig -I.. WebKitPluginAgent.defs WebKitPluginAgentReply.defs WebKitPluginHost.defs
VERBATIM)
@@ -429,11 +429,11 @@
OUTPUT
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
- MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+ DEPENDS mac/Plugins/Hosted/WebKitPluginClient.defs
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
VERBATIM)
-list(APPEND WebKit_SOURCES
+list(APPEND WebKitLegacy_SOURCES
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
Modified: trunk/Source/cmake/OptionsMac.cmake (222451 => 222452)
--- trunk/Source/cmake/OptionsMac.cmake 2017-09-25 18:41:26 UTC (rev 222451)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-09-25 19:03:00 UTC (rev 222452)
@@ -100,6 +100,8 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE ON)
+
WEBKIT_OPTION_END()
set(ENABLE_GRAPHICS_CONTEXT_3D ON)
