<!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>[172937] branches/safari-600.1-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/172937">172937</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-25 14:05:29 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172929">r172929</a>. <rdar://problem/18121645>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake">branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl">branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl</a></li>
<li><a href="#branchessafari6001branchWebKitLibrariesChangeLog">branches/safari-600.1-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari6001branchWebKitLibrarieswintoolsvspropscommonprops">branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172936 => 172937)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-25 21:02:57 UTC (rev 172936)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-25 21:05:29 UTC (rev 172937)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-25 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172929
+
+ 2014-08-25 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process
+ https://bugs.webkit.org/show_bug.cgi?id=136229
+
+ Reviewed by Dean Jackson.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make: Pass OFFICIAL_BUILD
+ flag to build-webinspectorui.pl.
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl: Accept and use
+ the OFFICIAL_BUILD flag.
+
</ins><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172689. <rdar://problem/18040028>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (172936 => 172937)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-25 21:02:57 UTC (rev 172936)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-25 21:05:29 UTC (rev 172937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> make:
</span><span class="cx"> -mkdir "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</span><del>- perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
</del><ins>+ perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%" "%OFFICIAL_BUILD%"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx">
</span><span class="cx"> xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (172936 => 172937)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-25 21:02:57 UTC (rev 172936)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-25 21:05:29 UTC (rev 172937)
</span><span class="lines">@@ -46,7 +46,7 @@
</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><span class="cx"> my ($JAVASCRIPTCORE_PRIVATE_HEADERS_DIR, $WEBCORE_PRIVATE_HEADERS_DIR);
</span><del>-if ($ENV{'OFFICIAL_BUILD'} eq '1') {
</del><ins>+if ($ARGV[4] eq '1') {
</ins><span class="cx"> $ARGV[1] =~ s/^\"//;
</span><span class="cx"> $ARGV[1] =~ s/\"$//;
</span><span class="cx"> my $Internal = Cwd::realpath($ARGV[1]);;
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> $ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'} = $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR;
</span><span class="cx"> $ENV{'WEBCORE_PRIVATE_HEADERS_DIR'} = $WEBCORE_PRIVATE_HEADERS_DIR;
</span><ins>+
</ins><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 class="cx">
</span><span class="lines">@@ -68,5 +69,17 @@
</span><span class="cx"> $ENV{'COMBINE_INSPECTOR_RESOURCES'} = 'YES';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+my $targetResourcePath = File::Spec->catdir($ENV{'TARGET_BUILD_DIR'}, $ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'});
+my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
+
+# Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
+my $jsFrom = File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorJSBackendCommands.js');
+my $jsTo = File::Spec->catfile($protocolDir, 'InspectorJSBackendCommands.js');
+print "Copying JavaScript bindings from $jsFrom to $jsTo\n";
+
+my $wcFrom = File::Spec->catfile($ENV{'WEBCORE_PRIVATE_HEADERS_DIR'}, 'InspectorWebBackendCommands.js');
+my $wcTo = File::Spec->catfile($protocolDir, 'InspectorWebBackendCommands.js');
+print "Copying WebCore bindings from $wcFrom to $wcTo\n";
+
</ins><span class="cx"> my $copyResourcesCommand = File::Spec->catfile($XSRCROOT, 'Scripts', 'copy-user-interface-resources.pl');
</span><span class="cx"> do $copyResourcesCommand;
</span></span></pre></div>
<a id="branchessafari6001branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (172936 => 172937)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-25 21:02:57 UTC (rev 172936)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-25 21:05:29 UTC (rev 172937)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-25 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172929
+
+ 2014-08-25 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process
+ https://bugs.webkit.org/show_bug.cgi?id=136229
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Pass OFFICIAL_BUILD argument
+ from VS to child Make processes.
+
</ins><span class="cx"> 2014-08-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172661. <rdar://problem/18037766>
</span></span></pre></div>
<a id="branchessafari6001branchWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props (172936 => 172937)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-08-25 21:02:57 UTC (rev 172936)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-08-25 21:05:29 UTC (rev 172937)
</span><span class="lines">@@ -15,12 +15,14 @@
</span><span class="cx"> set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
</span><span class="cx"> set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</span><span class="cx"> set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</span><ins>+set OFFICIAL_BUILD=$(OFFICIAL_BUILD)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
</span><span class="cx"> <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
</span><span class="cx"> set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</span><span class="cx"> set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</span><ins>+set OFFICIAL_BUILD=$(OFFICIAL_BUILD)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make clean
</span><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
</span><span class="cx"> <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="lines">@@ -241,4 +243,4 @@
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre>
</div>
</div>
</body>
</html>