<!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>[172416] tags/Safari-600.1.2.10/Source</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/172416">172416</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-11 15:30:46 -0700 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172397">r172397</a>. <rdar://problem/17978299></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6001210SourceJavaScriptCoreChangeLog">tags/Safari-600.1.2.10/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari6001210SourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd">tags/Safari-600.1.2.10/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd</a></li>
<li><a href="#tagsSafari6001210SourceWebCoreChangeLog">tags/Safari-600.1.2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari6001210SourceWebCoreWebCorevcxprojcopyForwardingHeaderscmd">tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd</a></li>
<li><a href="#tagsSafari6001210SourceWebInspectorUIChangeLog">tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake">tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make</a></li>
<li><a href="#tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIproj">tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj</a></li>
<li><a href="#tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl">tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6001210SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/JavaScriptCore/ChangeLog (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/JavaScriptCore/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/JavaScriptCore/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * JavaScriptCore.vcxproj/copy-files.cmd: Copy file for later use
+ in WebInspectorUI build.
+
</ins><span class="cx"> 2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171798. <rdar://problem/17849033>
</span></span></pre></div>
<a id="tagsSafari6001210SourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><ins>+xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
</ins><span class="cx">
</span><span class="cx"> echo Copying Web Replay scripts as if they were private headers...
</span><span class="cx"> for %%d in (
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebCore/ChangeLog (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebCore/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebCore/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCore.vcxproj/copyForwardingHeaders.cmd: Copy file needed
+ for WebInspectorUI build.
+
</ins><span class="cx"> 2014-08-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Branch-only build workaround.
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebCoreWebCorevcxprojcopyForwardingHeaderscmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -104,4 +104,7 @@
</span><span class="cx">
</span><span class="cx"> xcopy /y /d "%ProjectDir%..\testing\js\WebCoreTestSupport.h" "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
</span><span class="cx">
</span><ins>+set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\WebCore
+xcopy /y "%DerivedSourcesDirectory%\InspectorWebBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
+
</ins><span class="cx"> if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make: Make sure target for
+ xcopy operation exists.
+ * WebInspectorUI.vcxproj/WebInspectorUI.proj: Don't create directories
+ we don't need, make sure the target location exists before we build.
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl: Make sure that
+ production builds get the intermediary command files from the
+ right place.
+
</ins><span class="cx"> 2014-08-07 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172262
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> make:
</span><ins>+ -mkdir "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</ins><span class="cx"> perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
</span><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -16,12 +16,6 @@
</span><span class="cx"> <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</span><span class="cx"> <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</span><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><del>- <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>
</del><span class="cx"> <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
</span><span class="cx"> <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="lines">@@ -46,8 +40,9 @@
</span><span class="cx">
</span><span class="cx"> <Message Text="Build output -> $(OBJROOT)" />
</span><span class="cx"> <Message Text="Final output -> $(DSTROOT)" />
</span><del>- <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</del><ins>+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</ins><span class="cx"> <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
</span><ins>+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\WebInspectorUI;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\WebInspectorUI" />
</ins><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <!-- Generate the WebInspectorUI Bundle -->
</span></span></pre></div>
<a id="tagsSafari6001210SourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (172415 => 172416)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-11 22:30:46 UTC (rev 172416)
</span><span class="lines">@@ -45,9 +45,19 @@
</span><span class="cx">
</span><span class="cx"> my $TARGET_BUILD_DIR = File::Spec->catdir($XDSTROOT, "bin$ARGV[3]", 'WebKit.resources');
</span><span class="cx"> $ENV{'TARGET_BUILD_DIR'} = $TARGET_BUILD_DIR;
</span><del>-my $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'JavaScriptCore', 'DerivedSources');
</del><ins>+my ($JAVASCRIPTCORE_PRIVATE_HEADERS_DIR, $WEBCORE_PRIVATE_HEADERS_DIR);
+if ($ENV{'OFFICIAL_BUILD'} eq '1') {
+ $ARGV[1] =~ s/^\"//;
+ $ARGV[1] =~ s/\"$//;
+ my $Internal = Cwd::realpath($ARGV[1]);;
+ $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($Internal, 'include', 'private', 'JavaScriptCore');
+ $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($Internal, 'include', 'private', 'WebCore');
+} else {
+ $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'JavaScriptCore', 'DerivedSources');
+ $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore', 'DerivedSources');
+}
+
</ins><span class="cx"> $ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'} = $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR;
</span><del>-my $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore', 'DerivedSources');
</del><span class="cx"> $ENV{'WEBCORE_PRIVATE_HEADERS_DIR'} = $WEBCORE_PRIVATE_HEADERS_DIR;
</span><span class="cx"> my $DERIVED_SOURCES_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebInspectorUI', 'DerivedSources');
</span><span class="cx"> $ENV{'DERIVED_SOURCES_DIR'} = $DERIVED_SOURCES_DIR;
</span></span></pre>
</div>
</div>
</body>
</html>