<!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>[174895] 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/174895">174895</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 11:29:55 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix placement of a few items in vcxproj ItemGroups.
<https://webkit.org/b/137886>
Reviewed by Geoffrey Garen.
https://webkit.org/b/137873 is likely a cut-and-paste error that manifested
because we had ClCompile and ClInclude entries mixed up in the wrong ItemGroups.
We should fix these so that ClCompile entries are in the ClCompile ItemGroup,
and ClInclude entries in the ClInclude ItemGroup. This will help reduce the
chance of future cut-and-paste errors of this nature.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174894 => 174895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-20 18:06:48 UTC (rev 174894)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-20 18:29:55 UTC (rev 174895)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-20 Mark Lam <mark.lam@apple.com>
+
+ Fix placement of a few items in vcxproj ItemGroups.
+ <https://webkit.org/b/137886>
+
+ Reviewed by Geoffrey Garen.
+
+ https://webkit.org/b/137873 is likely a cut-and-paste error that manifested
+ because we had ClCompile and ClInclude entries mixed up in the wrong ItemGroups.
+ We should fix these so that ClCompile entries are in the ClCompile ItemGroup,
+ and ClInclude entries in the ClInclude ItemGroup. This will help reduce the
+ chance of future cut-and-paste errors of this nature.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+
</ins><span class="cx"> 2014-10-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Windows Build Fix after r174892.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (174894 => 174895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-10-20 18:06:48 UTC (rev 174894)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-10-20 18:29:55 UTC (rev 174895)
</span><span class="lines">@@ -304,7 +304,6 @@
</span><span class="cx"> <ClCompile Include="..\API\OpaqueJSString.cpp" />
</span><span class="cx"> <ClCompile Include="..\assembler\LinkBuffer.cpp" />
</span><span class="cx"> <ClCompile Include="..\assembler\MacroAssembler.cpp" />
</span><del>- <ClInclude Include="..\API\JSCTestRunnerUtils.h" />
</del><span class="cx"> <ClCompile Include="..\assembler\MacroAssemblerX86Common.cpp" />
</span><span class="cx"> <ClCompile Include="..\bindings\ScriptFunctionCall.cpp" />
</span><span class="cx"> <ClCompile Include="..\bindings\ScriptObject.cpp" />
</span><span class="lines">@@ -623,8 +622,10 @@
</span><span class="cx"> <ClCompile Include="..\jit\JITToDFGDeferredCompilationCallback.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\Reg.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\RegisterPreservationWrapperGenerator.cpp" />
</span><ins>+ <ClCompile Include="..\jit\RegisterSet.cpp" />
</ins><span class="cx"> <ClCompile Include="..\jit\Repatch.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\ScratchRegisterAllocator.cpp" />
</span><ins>+ <ClCompile Include="..\jit\TempRegisterSet.cpp" />
</ins><span class="cx"> <ClCompile Include="..\jit\ThunkGenerators.cpp" />
</span><span class="cx"> <ClCompile Include="..\llint\LLIntCLoop.cpp" />
</span><span class="cx"> <ClCompile Include="..\llint\LLIntData.cpp" />
</span><span class="lines">@@ -876,6 +877,7 @@
</span><span class="cx"> <ClInclude Include="..\API\JSAPIWrapperObject.h" />
</span><span class="cx"> <ClInclude Include="..\API\JSBase.h" />
</span><span class="cx"> <ClInclude Include="..\API\JSBasePrivate.h" />
</span><ins>+ <ClInclude Include="..\API\JSCTestRunnerUtils.h" />
</ins><span class="cx"> <ClInclude Include="..\API\JSCallbackConstructor.h" />
</span><span class="cx"> <ClInclude Include="..\API\JSCallbackFunction.h" />
</span><span class="cx"> <ClInclude Include="..\API\JSCallbackObject.h" />
</span><span class="lines">@@ -1349,14 +1351,12 @@
</span><span class="cx"> <ClInclude Include="..\jit\JITToDFGDeferredCompilationCallback.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITWriteBarrier.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JSInterfaceJIT.h" />
</span><del>- <ClCompile Include="..\jit\RegisterSet.cpp" />
</del><span class="cx"> <ClInclude Include="..\jit\Reg.h" />
</span><span class="cx"> <ClInclude Include="..\jit\RegisterPreservationWrapperGenerator.h" />
</span><span class="cx"> <ClInclude Include="..\jit\RegisterSet.h" />
</span><span class="cx"> <ClInclude Include="..\jit\Repatch.h" />
</span><span class="cx"> <ClInclude Include="..\jit\ScratchRegisterAllocator.h" />
</span><span class="cx"> <ClInclude Include="..\jit\SpecializedThunkJIT.h" />
</span><del>- <ClCompile Include="..\jit\TempRegisterSet.cpp" />
</del><span class="cx"> <ClInclude Include="..\jit\TempRegisterSet.h" />
</span><span class="cx"> <ClInclude Include="..\jit\ThunkGenerator.h" />
</span><span class="cx"> <ClInclude Include="..\jit\ThunkGenerators.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (174894 => 174895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-10-20 18:06:48 UTC (rev 174894)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-10-20 18:29:55 UTC (rev 174895)
</span><span class="lines">@@ -129,6 +129,9 @@
</span><span class="cx"> <ClCompile Include="..\assembler\MacroAssembler.cpp">
</span><span class="cx"> <Filter>assembler</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\assembler\MacroAssemblerX86Common.cpp">
+ <Filter>assembler</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\builtins\BuiltinExecutables.cpp">
</span><span class="cx"> <Filter>builtins</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -3033,9 +3036,6 @@
</span><span class="cx"> <ClInclude Include="..\runtime\VMEntryScope.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClCompile Include="..\assembler\MacroAssemblerX86Common.cpp">
- <Filter>assembler</Filter>
- </ClCompile>
</del><span class="cx"> <ClInclude Include="..\runtime\IntendedStructureChain.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre>
</div>
</div>
</body>
</html>