<!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>[196144] trunk/Source/JavaScriptCore</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/196144">196144</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 13:20:10 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=153886
<rdar://problem/24499887>
Reviewed by Mark Lam.
* JavaScriptCore.vcxproj/JavaScriptCore.proj:
In <a href="http://trac.webkit.org/projects/webkit/changeset/190253">r190253</a> I changed the directory of the headers from AppleInternal/include/JavaScriptCore
to AppleInternal/include/private/JavaScriptCore. This is ok for WebCore and WebKit, but not
other projects, such as CFNetwork, which expect the public API headers to be in the old location.
This used to be done by a combination of copy-files.cmd and the old JavaScriptCore.proj.
This change copies all the API headers, which copies everything in copy-files.cmd except APIShims.h
which does not exist any more. It copies additional headers that were not copied before, but
I think this is beneficial so we do not forget to add new public headers to a list of public headers
to be copied in the internal build. Having extra public headers in the internal Windows build is
not a problem because only internal clients use the internal Windows build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196143 => 196144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 21:14:54 UTC (rev 196143)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-02-04 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153886
+ <rdar://problem/24499887>
+
+ Reviewed by Mark Lam.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.proj:
+ In r190253 I changed the directory of the headers from AppleInternal/include/JavaScriptCore
+ to AppleInternal/include/private/JavaScriptCore. This is ok for WebCore and WebKit, but not
+ other projects, such as CFNetwork, which expect the public API headers to be in the old location.
+ This used to be done by a combination of copy-files.cmd and the old JavaScriptCore.proj.
+ This change copies all the API headers, which copies everything in copy-files.cmd except APIShims.h
+ which does not exist any more. It copies additional headers that were not copied before, but
+ I think this is beneficial so we do not forget to add new public headers to a list of public headers
+ to be copied in the internal build. Having extra public headers in the internal Windows build is
+ not a problem because only internal clients use the internal Windows build.
+
</ins><span class="cx"> 2016-02-03 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Make some classes non JSDestructibleObject
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (196143 => 196144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2016-02-04 21:14:54 UTC (rev 196143)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2016-02-04 21:20:10 UTC (rev 196144)
</span><span class="lines">@@ -68,6 +68,9 @@
</span><span class="cx"> <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\JavaScriptCore\**\*.*">
</span><span class="cx"> <Output TaskParameter="Include" ItemName="IncFiles" />
</span><span class="cx"> </CreateItem>
</span><ins>+ <CreateItem Include="$(SRCROOT)\API\*.h">
+ <Output TaskParameter="Include" ItemName="APIFiles" />
+ </CreateItem>
</ins><span class="cx"> <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</span><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Files" />
</span><span class="cx"> </CreateItem>
</span><span class="lines">@@ -106,6 +109,7 @@
</span><span class="cx"> </CreateItem>
</span><span class="cx">
</span><span class="cx"> <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</span><ins>+ <Copy SourceFiles="@(APIFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\JavaScriptCore\%(Filename)%(Extension)')" />
</ins><span class="cx"> <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
</span><span class="cx"> <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
</span></span></pre>
</div>
</div>
</body>
</html>