<!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>[187470] 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/187470">187470</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 17:32:53 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Ninja on Windows.
https://bugs.webkit.org/show_bug.cgi?id=147228
Reviewed by Martin Robinson.
.:
* Source/cmake/OptionsWindows.cmake:
Only use /MP when using generated Visual Studio solution files to build.
It makes compiling parallel in MSVC, but Ninja doesn't like it.
Source/JavaScriptCore:
* CMakeLists.txt:
Set the working directory when generating LowLevelInterpreterWin.asm to put LowLevelInterpreterWin.asm.sym in the right place.
Source/WebKit:
* PlatformWin.cmake:
Added /NODEFAULTLIB:LIBCMT to link WebKit.dll successfully with Ninja.
Source/WebKit/win:
* WebView.h:
Add more #if USE(CA) to protect the CACFLayer code.
Tools:
* WinLauncher/CMakeLists.txt:
WinLauncherLib must make WinLauncher.dll, not WinLauncherLib.dll.
* Scripts/build-webkit:
Use Ninja to build WinCairo by default, but fall back to Visual Studio if Ninja is not on the system.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewh">trunk/Source/WebKit/win/WebView.h</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.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="#trunkToolsWinLauncherCMakeListstxt">trunk/Tools/WinLauncher/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/ChangeLog 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-07-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Use Ninja on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=147228
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Only use /MP when using generated Visual Studio solution files to build.
+ It makes compiling parallel in MSVC, but Ninja doesn't like it.
+
+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Progress towards building AppleWin with CMake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147325
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -750,6 +750,7 @@
</span><span class="cx"> DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
</span><span class="cx"> COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}
</span><ins>+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # The explanation for not making LLIntAssembly.h part of the OBJECT_DEPENDS property of some of
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Use Ninja on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=147228
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt:
+ Set the working directory when generating LowLevelInterpreterWin.asm to put LowLevelInterpreterWin.asm.sym in the right place.
+
</ins><span class="cx"> 2015-07-27 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> SparseValueMap check is skipped when the butterfly's vectorLength is larger than the access-requested index
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/WebKit/ChangeLog 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-07-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Use Ninja on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=147228
+
+ Reviewed by Martin Robinson.
+
+ * PlatformWin.cmake:
+ Added /NODEFAULTLIB:LIBCMT to link WebKit.dll successfully with Ninja.
+
+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Progress towards building AppleWin with CMake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147325
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -406,6 +406,8 @@
</span><span class="cx"> list(APPEND WebKit_LIBRARIES ${CXX_LIBS})
</span><span class="cx"> set(CMAKE_CXX_STANDARD_LIBRARIES "")
</span><span class="cx">
</span><ins>+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "/NODEFAULTLIB:LIBCMT")
+
</ins><span class="cx"> # If this directory isn't created before midl runs and attempts to output WebKit.tlb,
</span><span class="cx"> # It fails with an unusual error - midl failed - failed to save all changes
</span><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-07-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Use Ninja on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=147228
+
+ Reviewed by Martin Robinson.
+
+ * WebView.h:
+ Add more #if USE(CA) to protect the CACFLayer code.
+
+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Progress towards building AppleWin with CMake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147325
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.h (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.h 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/WebKit/win/WebView.h 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "WebKit.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><del>-#include <WebCore/CACFLayerTreeHostClient.h>
</del><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/DragActions.h>
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="lines">@@ -43,6 +42,10 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+#if USE(CA)
+#include <WebCore/CACFLayerTreeHostClient.h>
+#endif
+
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> #include <WebCore/FullScreenControllerClient.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -89,7 +92,9 @@
</span><span class="cx"> , public IDropTarget
</span><span class="cx"> , WebCore::WindowMessageListener
</span><span class="cx"> , WebCore::GraphicsLayerClient
</span><ins>+#if USE(CA)
</ins><span class="cx"> , WebCore::CACFLayerTreeHostClient
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> , WebCore::FullScreenControllerClient
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -23,8 +23,10 @@
</span><span class="cx"> /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
</span><span class="cx"> /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
</span><span class="cx"> /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
</span><del>- /MP
</del><span class="cx"> )
</span><ins>+ if (NOT ${CMAKE_GENERATOR} MATCHES "Ninja")
+ add_definitions(/MP)
+ endif ()
</ins><span class="cx"> if (NOT ${CMAKE_CXX_FLAGS} STREQUAL "")
</span><span class="cx"> string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
</span><span class="cx"> string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Tools/ChangeLog 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Use Ninja on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=147228
+
+ Reviewed by Martin Robinson.
+
+ * WinLauncher/CMakeLists.txt:
+ WinLauncherLib must make WinLauncher.dll, not WinLauncherLib.dll.
+ * Scripts/build-webkit:
+ Use Ninja to build WinCairo by default, but fall back to Visual Studio if Ninja is not on the system.
+
</ins><span class="cx"> 2015-07-24 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Test for bug #147164 "[iOS] Keyboard bold/italic/underline keys don't
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Tools/Scripts/build-webkit 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -260,8 +260,15 @@
</span><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> chdirWebKit();
</span><span class="cx"> if (isWinCairo()) {
</span><del>- generateBuildSystemFromCMakeProject("WinCairo");
- $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
</del><ins>+ if (exitStatus(generateBuildSystemFromCMakeProject("WinCairo"))) {
+ die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
+ }
+ if (canUseNinja()) {
+ chdir "WebKitBuild/" . configuration();
+ $result = system("ninja");
+ } else {
+ $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> my $webkitSolutionPath = "Source/WebKit/WebKit.vcxproj/WebKit.sln";
</span><span class="cx"> $result = buildVisualStudioProject($webkitSolutionPath, $clean);
</span></span></pre></div>
<a id="trunkToolsWinLauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/CMakeLists.txt (187469 => 187470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-28 00:20:55 UTC (rev 187469)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-28 00:32:53 UTC (rev 187470)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> add_library(WinLauncherLib SHARED ${WinLauncher_SOURCES})
</span><span class="cx"> target_link_libraries(WinLauncherLib ${WinLauncher_LIBRARIES})
</span><span class="cx"> set_target_properties(WinLauncherLib PROPERTIES FOLDER "Tools")
</span><ins>+set_target_properties(WinLauncherLib PROPERTIES OUTPUT_NAME "WinLauncher")
</ins><span class="cx">
</span><span class="cx"> add_executable(WinLauncher WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp WinLauncher.vcxproj/WinLauncher.rc)
</span><span class="cx"> target_link_libraries(WinLauncher shlwapi)
</span></span></pre>
</div>
</div>
</body>
</html>