<!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>[160563] 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/160563">160563</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 13:49:36 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/160548">r160548</a>
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj: Specify
that we are using the vs12_xp target for Makefile-based projects.
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj: Ditto
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj: Ditto.
Source/WebCore:
* WebCore.vcxproj/WebCoreGenerated.vcxproj: Specify that we are
using the vs120_xp build target for Makefile-based projects.
Source/WTF:
* WTF.vcxproj/WTFGenerated.vcxproj: Specify that we are using
the vs12_xp target for Makefile-based projects.
Tools:
* win/AssembleBuildLogs/AssembleBuildLogs.vcxproj: Specify
we are using vs12_xp target for Makefile-based projects.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolswinAssembleBuildLogsAssembleBuildLogsvcxproj">trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj: Specify
+ that we are using the vs12_xp target for Makefile-based projects.
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj: Ditto
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj: Ditto.
+
</ins><span class="cx"> 2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Make inspector folder groups smarter in JavaScriptCore.xcodeproj
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -68,46 +68,57 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -211,4 +222,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -58,39 +58,51 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -268,4 +280,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -58,39 +58,51 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -254,4 +266,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/WTF/ChangeLog 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ * WTF.vcxproj/WTFGenerated.vcxproj: Specify that we are using
+ the vs12_xp target for Makefile-based projects.
+
</ins><span class="cx"> 2013-12-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Require variadic templates to build WebKit
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -64,50 +64,62 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -238,4 +250,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/WebCore/ChangeLog 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ * WebCore.vcxproj/WebCoreGenerated.vcxproj: Specify that we are
+ using the vs120_xp build target for Makefile-based projects.
+
</ins><span class="cx"> 2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add Inspector Code Generation to JavaScriptCore for Runtime Domain
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -67,56 +67,68 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -189,4 +201,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Tools/ChangeLog 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ * win/AssembleBuildLogs/AssembleBuildLogs.vcxproj: Specify
+ we are using vs12_xp target for Makefile-based projects.
+
</ins><span class="cx"> 2013-12-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Update Apple Webkit Bots
</span></span></pre></div>
<a id="trunkToolswinAssembleBuildLogsAssembleBuildLogsvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj (160562 => 160563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2013-12-13 21:36:55 UTC (rev 160562)
+++ trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2013-12-13 21:49:36 UTC (rev 160563)
</span><span class="lines">@@ -50,42 +50,52 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -200,4 +210,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre>
</div>
</div>
</body>
</html>