<!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>[196589] 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/196589">196589</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-02-15 12:30:52 -0800 (Mon, 15 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix internal Windows build of projects built after WebKit
https://bugs.webkit.org/show_bug.cgi?id=154249
rdar://problem/24644805
Reviewed by Chris Dumez.
Source/WebKit:
* PlatformWin.cmake:
Copy all generated headers to ForwardingHeaders/WebKit, not just WebKit.h.
This should fix problems related to not finding headers from other projects, such as AccessibleApplication.h.
WebKit.h, WebKitCOMAPI.h, and CFDictionaryPropertyBag.h were copied correctly, so this should copy the rest
of the needed headers.
Tools:
* DumpRenderTree/PlatformWin.cmake:
* MiniBrowser/win/CMakeLists.txt:
Don't include DerivedSources/WebKit/Interfaces to make MiniBrowser and DumpRenderTree
more like projects built internally after WebKit. They should only need to use what
is in ForwardingHeaders/WebKit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsMiniBrowserwinCMakeListstxt">trunk/Tools/MiniBrowser/win/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (196588 => 196589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-02-15 20:09:54 UTC (rev 196588)
+++ trunk/Source/WebKit/ChangeLog 2016-02-15 20:30:52 UTC (rev 196589)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-15 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build of projects built after WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=154249
+ rdar://problem/24644805
+
+ Reviewed by Chris Dumez.
+
+ * PlatformWin.cmake:
+ Copy all generated headers to ForwardingHeaders/WebKit, not just WebKit.h.
+ This should fix problems related to not finding headers from other projects, such as AccessibleApplication.h.
+ WebKit.h, WebKitCOMAPI.h, and CFDictionaryPropertyBag.h were copied correctly, so this should copy the rest
+ of the needed headers.
+
</ins><span class="cx"> 2016-02-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows WebKit debug build.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (196588 => 196589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2016-02-15 20:09:54 UTC (rev 196588)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-02-15 20:30:52 UTC (rev 196589)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
</span><span class="cx">
</span><span class="cx"> set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
</span><del>-file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
</del><ins>+file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
</ins><span class="cx"> add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
</span><span class="cx">
</span><span class="cx"> set(WebKit_OUTPUT_NAME
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196588 => 196589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-15 20:09:54 UTC (rev 196588)
+++ trunk/Tools/ChangeLog 2016-02-15 20:30:52 UTC (rev 196589)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-15 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build of projects built after WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=154249
+ rdar://problem/24644805
+
+ Reviewed by Chris Dumez.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * MiniBrowser/win/CMakeLists.txt:
+ Don't include DerivedSources/WebKit/Interfaces to make MiniBrowser and DumpRenderTree
+ more like projects built internally after WebKit. They should only need to use what
+ is in ForwardingHeaders/WebKit.
+
</ins><span class="cx"> 2016-02-12 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement paragraph related text marker functions using TextIterator
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (196588 => 196589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-02-15 20:09:54 UTC (rev 196588)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-02-15 20:30:52 UTC (rev 196589)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> TestNetscapePlugin/Tests
</span><span class="cx"> TestNetscapePlugin/win
</span><span class="cx"> TestNetscapePlugin/Tests/win
</span><del>- ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span></span></pre></div>
<a id="trunkToolsMiniBrowserwinCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (196588 => 196589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-02-15 20:09:54 UTC (rev 196588)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-02-15 20:30:52 UTC (rev 196589)
</span><span class="lines">@@ -2,8 +2,6 @@
</span><span class="cx"> ../MiniBrowser.vcxproj
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
</span><del>- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
</del><span class="cx"> "${WTF_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span></span></pre>
</div>
</div>
</body>
</html>