<!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>[165483] branches/safari-537.75-branch</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/165483">165483</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 11:10:35 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebInspectorUI: [Win] Unreviewed build fix.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Inspector files
must be copied to proper configuration build directory.
Source/WebKit: [Win] Unreviewed build fix.
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Correct
64-bit debug symbol export definition.
Tools: [Win] Unreviewed build correction
* win/AssembleBuildLogs/AssembleBuildLogs.vcxproj: The assemble
build logs script must look in the right configuration directory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWebInspectorUIChangeLog">branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebKitChangeLog">branches/safari-537.75-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#branchessafari53775branchToolsChangeLog">branches/safari-537.75-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari53775branchToolswinAssembleBuildLogsAssembleBuildLogsvcxproj">branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-03-12 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Inspector files
+ must be copied to proper configuration build directory.
+
</ins><span class="cx"> 2014-03-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165393.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -1,26 +1,54 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Debug_WinCairo|x64">
+ <Configuration>Debug_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug|Win32">
</span><span class="cx"> <Configuration>Debug</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Production|Win32">
</span><span class="cx"> <Configuration>Production</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Production|x64">
+ <Configuration>Production</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Release_WinCairo|Win32">
</span><span class="cx"> <Configuration>Release_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Release_WinCairo|x64">
+ <Configuration>Release_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Release|Win32">
</span><span class="cx"> <Configuration>Release</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <PropertyGroup Label="Globals">
</span><span class="cx"> <ProjectGuid>{0473724F-0AB3-4F12-892E-9FAB0186C804}</ProjectGuid>
</span><span class="lines">@@ -32,30 +60,69 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
</ins><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="lines">@@ -64,26 +131,61 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
</ins><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><span class="lines">@@ -95,6 +197,33 @@
</span><span class="cx"> <GenerateDebugInformation>true</GenerateDebugInformation>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -108,6 +237,19 @@
</span><span class="cx"> <OptimizeReferences>true</OptimizeReferences>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -121,6 +263,19 @@
</span><span class="cx"> <OptimizeReferences>true</OptimizeReferences>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -134,6 +289,19 @@
</span><span class="cx"> <OptimizeReferences>true</OptimizeReferences>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -147,6 +315,19 @@
</span><span class="cx"> <OptimizeReferences>true</OptimizeReferences>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\Info.plist" />
</span><span class="cx"> <None Include="..\Localizations\en.lproj\localizedStrings.js" />
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/ChangeLog (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-03-12 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Correct
+ 64-bit debug symbol export definition.
+
</ins><span class="cx"> 2014-03-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165393.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> symbolWithPointer(?currentFrameKnownToBeOpaque@BitmapImage@WebCore@@UAE_NXZ, ?currentFrameKnownToBeOpaque@BitmapImage@WebCore@@UEAA_NXZ)
</span><span class="cx"> symbolWithPointer(?hasSingleSecurityOrigin@BitmapImage@WebCore@@UBE_NXZ, ?hasSingleSecurityOrigin@BitmapImage@WebCore@@UEBA_NXZ)
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>- ?notSolidColor@BitmapImage@WebCore@@UAE_NXZ
</del><ins>+ symbolWithPointer(?notSolidColor@BitmapImage@WebCore@@UAE_NXZ, ?notSolidColor@BitmapImage@WebCore@@UEAA_NXZ)
</ins><span class="cx"> #endif
</span><span class="cx"> symbolWithPointer(?computeIntrinsicDimensions@Image@WebCore@@UAEXAAULength@2@0AAVFloatSize@2@@Z, ?computeIntrinsicDimensions@Image@WebCore@@UEAAXAEAULength@2@0AEAVFloatSize@2@@Z)
</span><span class="cx"> symbolWithPointer(?size@BitmapImage@WebCore@@UBE?AVIntSize@2@XZ, ?size@BitmapImage@WebCore@@UEBA?AVIntSize@2@XZ)
</span></span></pre></div>
<a id="branchessafari53775branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/ChangeLog (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/ChangeLog 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Tools/ChangeLog 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-03-12 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build correction
+
+ * win/AssembleBuildLogs/AssembleBuildLogs.vcxproj: The assemble
+ build logs script must look in the right configuration directory.
+
</ins><span class="cx"> 2014-03-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165393.
</span></span></pre></div>
<a id="branchessafari53775branchToolswinAssembleBuildLogsAssembleBuildLogsvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj (165482 => 165483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2014-03-12 18:08:35 UTC (rev 165482)
+++ branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2014-03-12 18:10:35 UTC (rev 165483)
</span><span class="lines">@@ -9,6 +9,14 @@
</span><span class="cx"> <Configuration>Debug</Configuration>
</span><span class="cx"> <Platform>x64</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Production|Win32">
</span><span class="cx"> <Configuration>Production</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -39,6 +47,14 @@
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ </PropertyGroup>
</ins><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><span class="lines">@@ -66,6 +82,14 @@
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="lines">@@ -95,6 +119,18 @@
</span><span class="cx"> <NMakeReBuildCommandLine>AssembleLogs.cmd</NMakeReBuildCommandLine>
</span><span class="cx"> <NMakeCleanCommandLine>if exist "%CONFIGURATIONBUILDDIR%\BuildOutput.htm" del "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"</NMakeCleanCommandLine>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+ <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ <NMakeBuildCommandLine>AssembleLogs.cmd</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>AssembleLogs.cmd</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>if exist "%CONFIGURATIONBUILDDIR%\BuildOutput.htm" del "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"</NMakeCleanCommandLine>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
+ <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ <NMakeBuildCommandLine>AssembleLogs.cmd</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>AssembleLogs.cmd</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>if exist "%CONFIGURATIONBUILDDIR%\BuildOutput.htm" del "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"</NMakeCleanCommandLine>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</span><span class="cx"> <NMakeBuildCommandLine>AssembleLogs.cmd</NMakeBuildCommandLine>
</span></span></pre>
</div>
</div>
</body>
</html>