<!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>[172267] tags/Safari-600.1.2.8/Source/WebInspectorUI</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/172267">172267</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 14:20:44 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172262">r172262</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari600128SourceWebInspectorUIChangeLog">tags/Safari-600.1.2.8/Source/WebInspectorUI/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari600128SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIproj">tags/Safari-600.1.2.8/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari600128SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.8/Source/WebInspectorUI/ChangeLog (172266 => 172267)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.8/Source/WebInspectorUI/ChangeLog        2014-08-07 21:19:54 UTC (rev 172266)
+++ tags/Safari-600.1.2.8/Source/WebInspectorUI/ChangeLog        2014-08-07 21:20:44 UTC (rev 172267)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-08-07 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172262
+
+ 2014-08-07 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix.
+
+ Add a WebInspectorUI.proj file for use with MSBuild utility.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.proj: Added.
+
+2014-08-07 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172202
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="tagsSafari600128SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIprojfromrev172262trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIproj"></a>
<div class="copfile"><h4>Copied: tags/Safari-600.1.2.8/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (from rev 172262, trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj) (0 => 172267)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.8/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj         (rev 0)
+++ tags/Safari-600.1.2.8/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj        2014-08-07 21:20:44 UTC (rev 172267)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<Project InitialTargets="PreBuild" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <!-- normalize configuration case -->
+ <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
+        <CONFIG>Production</CONFIG>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
+ <!-- We use the same content for Debug and Release targets. Don't let them accidentally ship the non-minimized version -->
+        <CONFIG>Production</CONFIG>
+ </PropertyGroup>
+
+ <!-- Wrapper to build WebInspectorUI for both win32 and x64. -->
+ <PropertyGroup>
+ <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
+ <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
+ <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
+ <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
+ <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
+ <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
+ <AppleInternalBin32>$(AppleInternal)\bin32</AppleInternalBin32>
+ <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
+ <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
+ <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
+ <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+ <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
+ <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
+ <OutputDirectory>$(DSTROOT)</OutputDirectory>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <WebInspectorUI Include="WebInspectorUI.vcxproj">
+ <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
+ </WebInspectorUI>
+ <WebInspectorUI Include="WebInspectorUI.vcxproj">
+ <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
+ </WebInspectorUI>
+ </ItemGroup>
+
+ <!-- Prepare for build -->
+ <Target Name="PreBuild" BeforeTargets="Build">
+ <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
+ <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
+ <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT)" />
+
+ <Message Text="Build output -> $(OBJROOT)" />
+ <Message Text="Final output -> $(DSTROOT)" />
+ <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
+ </Target>
+
+ <!-- Generate the WebInspectorUI Bundle -->
+ <Target Name="Build" AfterTargets="PreBuild">
+ <Message Text="Building $(CONFIGURATION) Solution" />
+ <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
+ <Message Text="Output=$(WebKit_OutputDir)" />
+ <MSBuild Projects="@(WebInspectorUI)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
+ </Target>
+
+ <Target Name="PostBuild" AfterTargets="Build">
+ <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
+ <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
+
+ <!-- Identify the files to copy over -->
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">
+ <Output TaskParameter="Include" ItemName="Bin32Resources" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
+ <Output TaskParameter="Include" ItemName="Bin64Resources" />
+ </CreateItem>
+
+ <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+ </Target>
+
+</Project>
+
</ins></span></pre>
</div>
</div>
</body>
</html>