<!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>[200774] trunk/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/200774">200774</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-12 08:47:45 -0700 (Thu, 12 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Windows Perl fails to run copy-user-interface-resources.pl
https://bugs.webkit.org/show_bug.cgi?id=157620
<rdar://problem/26241548>
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-05-12
Reviewed by Timothy Hatcher.
There are two problems on Windows platform. 'cat' command is
missing and can not execute shebang.
* Scripts/copy-user-interface-resources.pl: Invoke Perl scripts
with explicitly specifying Perl command instead of relying on
shebang. Add a new subroutine 'appendFile' to concatenate files
instread of 'cat' command.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200773 => 200774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-12 15:43:43 UTC (rev 200773)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-12 15:47:45 UTC (rev 200774)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-12 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ Web Inspector: Windows Perl fails to run copy-user-interface-resources.pl
+ https://bugs.webkit.org/show_bug.cgi?id=157620
+ <rdar://problem/26241548>
+
+ Reviewed by Timothy Hatcher.
+
+ There are two problems on Windows platform. 'cat' command is
+ missing and can not execute shebang.
+
+ * Scripts/copy-user-interface-resources.pl: Invoke Perl scripts
+ with explicitly specifying Perl command instead of relying on
+ shebang. Add a new subroutine 'appendFile' to concatenate files
+ instread of 'cat' command.
+
</ins><span class="cx"> 2016-05-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: 3.8% of timeline recording spent in NavigationSidebarPanel _updateContentOverflowShadowVisibility for background tab
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (200773 => 200774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-05-12 15:43:43 UTC (rev 200773)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-05-12 15:47:45 UTC (rev 200774)
</span><span class="lines">@@ -61,6 +61,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub appendFile($$)
+{
+ my ($targetFile, $srcFile) = @_;
+
+ open(SRC_FILE, '<', $srcFile) or die "Unable to open $srcFile: $!";
+ my @srcText = <SRC_FILE>;
+ close(SRC_FILE);
+ open(TARGET_FILE, '>>', $targetFile) or die "Unable to open $targetFile: $!";
+ print TARGET_FILE @srcText;
+ close(TARGET_FILE);
+}
+
</ins><span class="cx"> sub readLicenseFile($)
</span><span class="cx"> {
</span><span class="cx"> my ($licenseFilePath) = @_;
</span><span class="lines">@@ -119,6 +131,7 @@
</span><span class="cx"> */
</span><span class="cx"> EOF
</span><span class="cx">
</span><ins>+my $perl = $^X;
</ins><span class="cx"> my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
</span><span class="cx"> my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
</span><span class="cx"> my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
</span><span class="lines">@@ -155,24 +168,24 @@
</span><span class="cx">
</span><span class="cx"> if ($shouldCombineMain) {
</span><span class="cx"> # Remove Debug JavaScript and CSS files in Production builds.
</span><del>- system($combineResourcesCmd, '--input-dir', 'Debug', '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Debug.js', '--output-style-name', 'Debug.css', '--strip');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-dir', 'Debug', '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Debug.js', '--output-style-name', 'Debug.css', '--strip');
</ins><span class="cx">
</span><span class="cx"> # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
</span><span class="cx"> my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
</span><del>- system($combineResourcesCmd, '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
</ins><span class="cx">
</span><span class="cx"> # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
</span><del>- system($combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
</ins><span class="cx">
</span><span class="cx"> # Combine the Esprima JavaScript files in Production builds into a single file (Esprima.js).
</span><del>- system($combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Esprima.js');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Esprima.js');
</ins><span class="cx">
</span><span class="cx"> # Combine the ESLint JavaScript files in Production builds into a single file (ESLint.js).
</span><del>- system($combineResourcesCmd, '--input-dir', 'External/ESLint', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'ESLint.js');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-dir', 'External/ESLint', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'ESLint.js');
</ins><span class="cx">
</span><span class="cx"> # Remove console.assert calls from the Main.js file.
</span><span class="cx"> my $derivedSourcesMainJS = File::Spec->catfile($derivedSourcesDir, 'Main.js');
</span><del>- system(File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-script', $derivedSourcesMainJS, '--output-script', $derivedSourcesMainJS);
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-script', $derivedSourcesMainJS, '--output-script', $derivedSourcesMainJS);
</ins><span class="cx">
</span><span class="cx"> # Fix Image URLs in the Main.css file by removing the "../".
</span><span class="cx"> my $derivedSourcesMainCSS = File::Spec->catfile($derivedSourcesDir, 'Main.css');
</span><span class="lines">@@ -244,10 +257,10 @@
</span><span class="cx"> ditto(File::Spec->catfile($uiRoot, 'Workers'), $workersDir);
</span><span class="cx">
</span><span class="cx"> # Remove console.assert calls from the Worker js files.
</span><del>- system(File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-directory', $workersDir);
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-directory', $workersDir);
</ins><span class="cx">
</span><span class="cx"> # Fix import references in Workers directories. This rewrites "../../External/script.js" import paths to their new locations.
</span><del>- system(File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'), '--input-directory', $workersDir) and die "Failed to update Worker imports for optimized builds.";
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'), '--input-directory', $workersDir) and die "Failed to update Worker imports for optimized builds.";
</ins><span class="cx"> } else {
</span><span class="cx"> # Keep the files separate for engineering builds.
</span><span class="cx"> ditto($uiRoot, $targetResourcePath);
</span><span class="lines">@@ -255,12 +268,12 @@
</span><span class="cx">
</span><span class="cx"> if ($shouldCombineTest) {
</span><span class="cx"> # Combine the JavaScript files for testing into a single file (TestCombined.js).
</span><del>- system($combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Test.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestCombined.js', '--output-style-name', 'TestCombined.css');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Test.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestCombined.js', '--output-style-name', 'TestCombined.css');
</ins><span class="cx">
</span><span class="cx"> my $derivedSourcesTestHTML = File::Spec->catfile($derivedSourcesDir, 'Test.html');
</span><span class="cx"> my $derivedSourcesTestJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
</span><span class="cx"> # Combine the Esprima JavaScript files for testing into a single file (Esprima.js).
</span><del>- system($combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesTestHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestEsprima.js');
</del><ins>+ system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesTestHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestEsprima.js');
</ins><span class="cx">
</span><span class="cx"> # Export the license into TestCombined.js.
</span><span class="cx"> my $targetTestJS = File::Spec->catfile($targetResourcePath, 'TestCombined.js');
</span><span class="lines">@@ -271,11 +284,11 @@
</span><span class="cx"> seedFile($targetEsprimaJS, $esprimaLicense);
</span><span class="cx">
</span><span class="cx"> # Append TestCombined.js to the license that was exported above.
</span><del>- system(qq(cat "$derivedSourcesTestJS" >> "$targetTestJS")) and die "Failed to append $derivedSourcesTestJS: $!";
</del><ins>+ appendFile($targetTestJS, $derivedSourcesTestJS);
</ins><span class="cx">
</span><span class="cx"> # Append Esprima.js to the license that was exported above.
</span><span class="cx"> my $derivedSourcesEsprimaJS = File::Spec->catfile($derivedSourcesDir, 'TestEsprima.js');
</span><del>- system(qq(cat "$derivedSourcesEsprimaJS" >> "$targetEsprimaJS")) and die "Failed to append $derivedSourcesEsprimaJS: $!";
</del><ins>+ appendFile($targetEsprimaJS, $derivedSourcesEsprimaJS);
</ins><span class="cx">
</span><span class="cx"> # Copy over Test.html.
</span><span class="cx"> copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html'));
</span></span></pre>
</div>
</div>
</body>
</html>