<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191749] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191749">191749</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-29 13:01:20 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Mac CMake build
https://bugs.webkit.org/show_bug.cgi?id=150686
Reviewed by Filip Pizlo.
.:
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* API/ObjCCallbackFunction.mm:
* CMakeLists.txt:
* PlatformMac.cmake:
Source/WebCore:
* PlatformMac.cmake:
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
Source/WebKit2:
* CMakeLists.txt:
* PlatformMac.cmake:
Source/WTF:
* wtf/CMakeLists.txt:
* wtf/Platform.h:
* wtf/PlatformMac.cmake:
Tools:
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(isCachedArgumentfileOutOfDate):
(wrapperPrefixIfNeeded):
(generateBuildSystemFromCMakeProject):
(buildCMakeGeneratedProject):
(cmakeBasedPortName):
(determineIsCMakeBuild):
(isCMakeBuild):
(promptUser):
(jhbuildWrapperPrefixIfNeeded): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm">trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2015-10-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile and link with CMake on Mac
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import "JSValueInternal.h"
</span><span class="cx"> #import "ObjCCallbackFunction.h"
</span><span class="cx"> #import "ObjcRuntimeExtras.h"
</span><ins>+#import "StructureInlines.h"
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -8,6 +8,8 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/API"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/assembler"
</span><ins>+ "${JAVASCRIPTCORE_DIR}/b3"
+ "${JAVASCRIPTCORE_DIR}/b3/air"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/bindings"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/builtins"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/bytecode"
</span><span class="lines">@@ -1219,14 +1221,44 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
- MAIN_DEPENDENCY ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py
- DEPENDS ${JavaScriptCore_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework JavaScriptCore --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} --combined ${JavaScriptCore_BUILTINS_SOURCES}
- VERBATIM)
</del><ins>+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3AddressMatcher.h
+ MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/b3/B3AddressMatcher.patterns
+ DEPENDS ${JAVASCRIPTCORE_DIR}/b3/generate_pattern_matcher.rb
+ COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/b3/generate_pattern_matcher.rb ${JAVASCRIPTCORE_DIR}/b3/B3AddressMatcher.patterns VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
</ins><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3LoweringMatcher.h
+ MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/b3/B3LoweringMatcher.patterns
+ DEPENDS ${JAVASCRIPTCORE_DIR}/b3/generate_pattern_matcher.rb
+ COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/b3/generate_pattern_matcher.rb ${JAVASCRIPTCORE_DIR}/b3/B3LoweringMatcher.patterns VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h
+ MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/b3/air/AirOpcode.opcodes
+ DEPENDS ${JAVASCRIPTCORE_DIR}/b3/air/opcode_generator.rb
+ COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/b3/air/opcode_generator.rb ${JAVASCRIPTCORE_DIR}/b3/air/AirOpcode.opcodes VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
+
</ins><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3AddressMatcher.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3LoweringMatcher.h
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+ MAIN_DEPENDENCY ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py
+ DEPENDS ${JavaScriptCore_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework JavaScriptCore --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} --combined ${JavaScriptCore_BUILTINS_SOURCES}
+ VERBATIM)
+
+list(APPEND JavaScriptCore_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
</span><span class="lines">@@ -1331,3 +1363,5 @@
</span><span class="cx">
</span><span class="cx"> add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
</span><span class="cx"> add_dependencies(JavaScriptCore stageSharedScripts)
</span><ins>+
+WEBKIT_FRAMEWORK(JavaScriptCore)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * API/ObjCCallbackFunction.mm:
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Air needs syntax for escaping StackSlots
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,13 +1,3 @@
</span><del>-find_library(COCOA_LIBRARY Cocoa)
-find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-find_library(READLINE_LIBRARY Readline)
-list(APPEND JavaScriptCore_LIBRARIES
- ${COREFOUNDATION_LIBRARY}
- ${COCOA_LIBRARY}
- ${READLINE_LIBRARY}
- libicucore.dylib
-)
-
</del><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> API/JSAPIWrapperObject.mm
</span><span class="cx"> API/JSContext.mm
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/CMakeLists.txt:
+ * wtf/Platform.h:
+ * wtf/PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r191728.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -290,3 +290,5 @@
</span><span class="cx"> if (WTF_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><ins>+
+WEBKIT_FRAMEWORK(WTF)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/Platform.h 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx">
</span><span class="cx"> /* The B3 compiler is an experimental backend that is still in development. We will keep it building
</span><span class="cx"> on Mac/x86-64 for now, though it is unused except for tests. */
</span><del>-#if PLATFORM(MAC) && CPU(X86_64)
</del><ins>+#if PLATFORM(MAC) && CPU(X86_64) && ENABLE(FTL_JIT)
</ins><span class="cx"> #define ENABLE_B3_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+set(WTF_LIBRARY_TYPE SHARED)
+
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+find_library(READLINE_LIBRARY Readline)
+list(APPEND WTF_LIBRARIES
+ ${COREFOUNDATION_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${READLINE_LIBRARY}
+ libicucore.dylib
+)
+
</ins><span class="cx"> list(APPEND WTF_SOURCES
</span><span class="cx"> AutodrainedPoolMac.mm
</span><span class="cx"> RunLoopTimerCF.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> One more URTBF after r191731.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> page/mac/ChromeMac.mm
</span><span class="cx"> page/mac/DragControllerMac.mm
</span><span class="cx"> page/mac/EventHandlerMac.mm
</span><del>- page/mac/PageMac.cpp
</del><ins>+ page/mac/PageMac.mm
</ins><span class="cx"> page/mac/ServicesOverlayController.mm
</span><span class="cx"> page/mac/SettingsMac.mm
</span><span class="cx"> page/mac/TextIndicatorWindow.mm
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -44,6 +44,4 @@
</span><span class="cx"> set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-POPULATE_LIBRARY_VERSION(WEBKIT)
-set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
-install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
</del><ins>+WEBKIT_FRAMEWORK(WebKit)
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile and link with CMake on Mac
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -408,7 +408,10 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
</span><ins>+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
</ins><span class="cx">
</span><ins>+set(WebKit_OUTPUT_NAME WebKitLegacy)
+
</ins><span class="cx"> set(WebKitLegacy_WebCore_FORWARDING_HEADERS
</span><span class="cx"> DOMElement.h
</span><span class="cx"> DOMHTMLFormElement.h
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C"
</span><ins>+ "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/cpp"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Authentication"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Databases"
</span><span class="lines">@@ -455,6 +456,51 @@
</span><span class="cx"> UIProcess/API/C/WKViewportAttributes.cpp
</span><span class="cx"> UIProcess/API/C/WKWindowFeaturesRef.cpp
</span><span class="cx">
</span><ins>+ UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
+ UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
+ UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
+ UIProcess/API/Cocoa/LegacyBundleForClass.mm
+ UIProcess/API/Cocoa/WKBackForwardList.mm
+ UIProcess/API/Cocoa/WKBackForwardListItem.mm
+ UIProcess/API/Cocoa/WKBrowsingContextController.mm
+ UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
+ UIProcess/API/Cocoa/WKConnection.mm
+ UIProcess/API/Cocoa/WKError.mm
+ UIProcess/API/Cocoa/WKFrameInfo.mm
+ UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
+ UIProcess/API/Cocoa/WKNavigation.mm
+ UIProcess/API/Cocoa/WKNavigationAction.mm
+ UIProcess/API/Cocoa/WKNavigationData.mm
+ UIProcess/API/Cocoa/WKNavigationResponse.mm
+ UIProcess/API/Cocoa/WKPreferences.mm
+ UIProcess/API/Cocoa/WKProcessGroup.mm
+ UIProcess/API/Cocoa/WKProcessPool.mm
+ UIProcess/API/Cocoa/WKScriptMessage.mm
+ UIProcess/API/Cocoa/WKSecurityOrigin.mm
+ UIProcess/API/Cocoa/WKTypeRefWrapper.mm
+ UIProcess/API/Cocoa/WKUserContentController.mm
+ UIProcess/API/Cocoa/WKUserScript.mm
+ UIProcess/API/Cocoa/WKWebView.mm
+ UIProcess/API/Cocoa/WKWebViewConfiguration.mm
+ UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
+ UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+ UIProcess/API/Cocoa/WKWindowFeatures.mm
+ UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
+ UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
+ UIProcess/API/Cocoa/_WKDownload.mm
+ UIProcess/API/Cocoa/_WKElementAction.mm
+ UIProcess/API/Cocoa/_WKElementInfo.mm
+ UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
+ UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
+ UIProcess/API/Cocoa/_WKSessionState.mm
+ UIProcess/API/Cocoa/_WKThumbnailView.mm
+ UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
+ UIProcess/API/Cocoa/_WKUserContentFilter.mm
+ UIProcess/API/Cocoa/_WKUserStyleSheet.mm
+ UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
+ UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
+ UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
+
</ins><span class="cx"> UIProcess/Authentication/AuthenticationChallengeProxy.cpp
</span><span class="cx"> UIProcess/Authentication/AuthenticationDecisionListener.cpp
</span><span class="cx"> UIProcess/Authentication/WebCredential.cpp
</span><span class="lines">@@ -839,7 +885,11 @@
</span><span class="cx"> POPULATE_LIBRARY_VERSION(WEBKIT2)
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
</span><span class="cx">
</span><del>-install(TARGETS WebKit2 WebProcess
</del><ins>+if (APPLE)
+ WEBKIT_FRAMEWORK(WebKit2)
+else ()
+ install(TARGETS WebKit2 WebProcess
</ins><span class="cx"> LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
</span><span class="cx"> RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
</span><del>-)
</del><ins>+ )
+endif ()
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r191728.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -473,12 +473,16 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ Platform
</ins><span class="cx"> Shared
</span><ins>+
+ Shared/API
+ Shared/Cocoa
+
</ins><span class="cx"> Shared/API/Cocoa
</span><span class="cx"> Shared/API/c
</span><span class="cx">
</span><span class="cx"> Shared/API/c/cf
</span><del>-
</del><span class="cx"> Shared/API/c/mac
</span><span class="cx">
</span><span class="cx"> UIProcess/Cocoa
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -242,6 +242,12 @@
</span><span class="cx"> source_group("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><ins>+macro(WEBKIT_FRAMEWORK _target)
+ if (APPLE)
+ set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
+ install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
+ endif ()
+endmacro()
</ins><span class="cx">
</span><span class="cx"> macro(WEBKIT_CREATE_FORWARDING_HEADER _target_directory _file)
</span><span class="cx"> get_filename_component(_source_path "${CMAKE_SOURCE_DIR}/Source/" ABSOLUTE)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (isCachedArgumentfileOutOfDate):
+ (wrapperPrefixIfNeeded):
+ (generateBuildSystemFromCMakeProject):
+ (buildCMakeGeneratedProject):
+ (cmakeBasedPortName):
+ (determineIsCMakeBuild):
+ (isCMakeBuild):
+ (promptUser):
+ (jhbuildWrapperPrefixIfNeeded): Deleted.
+
</ins><span class="cx"> 2015-10-29 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach JSC bots to build 32bit instead of x86_64
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/Scripts/build-webkit 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> }
</span><span class="cx"> exit exitStatus($result);
</span><span class="cx"> }
</span><del>-} elsif (isAppleMacWebKit()) {
</del><ins>+} elsif (isAppleMacWebKit() && !isCMakeBuild()) {
</ins><span class="cx"> # Build, and abort if the build fails.
</span><span class="cx"> for my $dir (@projects) {
</span><span class="cx"> chdir $dir or die;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (191748 => 191749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-29 20:01:20 UTC (rev 191749)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> my $osXVersion;
</span><span class="cx"> my $iosVersion;
</span><span class="cx"> my $generateDsym;
</span><ins>+my $isCMakeBuild;
</ins><span class="cx"> my $isGtk;
</span><span class="cx"> my $isWinCairo;
</span><span class="cx"> my $isWin64;
</span><span class="lines">@@ -1792,11 +1793,14 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub jhbuildWrapperPrefixIfNeeded()
</del><ins>+sub wrapperPrefixIfNeeded()
</ins><span class="cx"> {
</span><span class="cx"> if (isWindows() || isCygwin()) {
</span><span class="cx"> return ();
</span><span class="cx"> }
</span><ins>+ if (isAppleMacWebKit()) {
+ return ("xcrun");
+ }
</ins><span class="cx"> if (-e getJhbuildPath()) {
</span><span class="cx"> my @prefix = (File::Spec->catfile(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper"));
</span><span class="cx"> if (isEfl()) {
</span><span class="lines">@@ -1954,7 +1958,7 @@
</span><span class="cx">
</span><span class="cx"> # We call system("cmake @args") instead of system("cmake", @args) so that @args is
</span><span class="cx"> # parsed for shell metacharacters.
</span><del>- my $wrapper = join(" ", jhbuildWrapperPrefixIfNeeded()) . " ";
</del><ins>+ my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
</ins><span class="cx"> my $returnCode = system($wrapper . "cmake @args");
</span><span class="cx">
</span><span class="cx"> chdir($originalWorkingDirectory);
</span><span class="lines">@@ -1988,7 +1992,7 @@
</span><span class="cx">
</span><span class="cx"> # We call system("cmake @args") instead of system("cmake", @args) so that @args is
</span><span class="cx"> # parsed for shell metacharacters. In particular, $makeArgs may contain such metacharacters.
</span><del>- my $wrapper = join(" ", jhbuildWrapperPrefixIfNeeded()) . " ";
</del><ins>+ my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
</ins><span class="cx"> return system($wrapper . "$command @args");
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -2035,12 +2039,23 @@
</span><span class="cx"> {
</span><span class="cx"> return "Efl" if isEfl();
</span><span class="cx"> return "GTK" if isGtk();
</span><ins>+ return "Mac" if isAppleMacWebKit();
</ins><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub determineIsCMakeBuild()
+{
+ return if defined($isCMakeBuild);
+ $isCMakeBuild = checkForArgumentAndRemoveFromARGV("--cmake");
+}
+
</ins><span class="cx"> sub isCMakeBuild()
</span><span class="cx"> {
</span><del>- return isEfl() || isGtk();
</del><ins>+ if (isEfl() || isGtk()) {
+ return 1;
+ }
+ determineIsCMakeBuild();
+ return $isCMakeBuild;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub promptUser
</span></span></pre>
</div>
</div>
</body>
</html>