<!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>[280596] branches/safari-612.1.15.4-branch/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/280596">280596</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-08-03 09:44:02 -0700 (Tue, 03 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280574">r280574</a>. rdar://problem/81466166

    Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
    https://bugs.webkit.org/show_bug.cgi?id=228716

    Reviewed by Maciej Stachowiak.

    Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
    logging message to reflect that the file will by copied later in the build.

    * WebInspectorUI.vcxproj/WebInspectorUI.make:
    * WebInspectorUI.vcxproj/build-webinspectorui.pl:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280574 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121154branchSourceWebInspectorUIChangeLog">branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6121154branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake">branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make</a></li>
<li><a href="#branchessafari6121154branchSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl">branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121154branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog (280595 => 280596)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog        2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog   2021-08-03 16:44:02 UTC (rev 280596)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2021-08-03  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r280574. rdar://problem/81466166
+
+    Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
+    https://bugs.webkit.org/show_bug.cgi?id=228716
+    
+    Reviewed by Maciej Stachowiak.
+    
+    Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
+    logging message to reflect that the file will by copied later in the build.
+    
+    * WebInspectorUI.vcxproj/WebInspectorUI.make:
+    * WebInspectorUI.vcxproj/build-webinspectorui.pl:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-02  Patrick Angle  <pangle@apple.com>
+
+            Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
+            https://bugs.webkit.org/show_bug.cgi?id=228716
+
+            Reviewed by Maciej Stachowiak.
+
+            Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
+            logging message to reflect that the file will by copied later in the build.
+
+            * WebInspectorUI.vcxproj/WebInspectorUI.make:
+            * WebInspectorUI.vcxproj/build-webinspectorui.pl:
+
</ins><span class="cx"> 2021-05-10  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Network: rename "XHR" to "XHR/Fetch"
</span></span></pre></div>
<a id="branchessafari6121154branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (280595 => 280596)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make       2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make  2021-08-03 16:44:02 UTC (rev 280596)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">  @xcopy /y /e "..\UserInterface\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</span><span class="cx">  if errorlevel 1 exit 1
</span><span class="cx"> 
</span><del>-       @xcopy /y /e "..\AppleInternal\include\private\JavaScriptCore\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
</del><ins>+        @xcopy /y /e "%JAVASCRIPTCORE_PRIVATE_HEADERS_DIR%\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
</ins><span class="cx">   if errorlevel 1 exit 1
</span><span class="cx"> 
</span><span class="cx">  if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="branchessafari6121154branchSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (280595 => 280596)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl   2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl      2021-08-03 16:44:02 UTC (rev 280596)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx"> my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
</span><span class="cx"> 
</span><span class="cx"> # Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
</span><del>-my $jsFrom = File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorBackendCommands.js');
</del><ins>+my $jsFrom = File::Spec->catfile(File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'inspector'), 'InspectorBackendCommands.js');
</ins><span class="cx"> my $jsTo = File::Spec->catfile($protocolDir, 'InspectorBackendCommands.js');
</span><del>-print "Copying Inspector bindings from $jsFrom to $jsTo\n";
</del><ins>+print "Inspector bindings will be copied from $jsFrom to $jsTo\n";
</ins><span class="cx"> 
</span><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>
</div>

</body>
</html>