<!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>[173070] trunk/Tools</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/173070">173070</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-28 12:19:33 -0700 (Thu, 28 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build-webkit --inspector-frontend tries to copy files from old inspector path
https://bugs.webkit.org/show_bug.cgi?id=136346
Reviewed by Timothy Hatcher.
Remove the old code path for copying inspector resources. It doesn't work.
Complain if this option is passed to CMake-based builds.
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(copyInspectorFrontendFiles): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173069 => 173070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-28 19:09:48 UTC (rev 173069)
+++ trunk/Tools/ChangeLog 2014-08-28 19:19:33 UTC (rev 173070)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-28 Brian J. Burg <burg@cs.washington.edu>
+
+ build-webkit --inspector-frontend tries to copy files from old inspector path
+ https://bugs.webkit.org/show_bug.cgi?id=136346
+
+ Reviewed by Timothy Hatcher.
+
+ Remove the old code path for copying inspector resources. It doesn't work.
+ Complain if this option is passed to CMake-based builds.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (copyInspectorFrontendFiles): Deleted.
+
</ins><span class="cx"> 2014-08-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Dashboard metrics page could show longest stretch of red
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (173069 => 173070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-08-28 19:09:48 UTC (rev 173069)
+++ trunk/Tools/Scripts/build-webkit 2014-08-28 19:19:33 UTC (rev 173070)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> --wincairo Build using Cairo (rather than CoreGraphics) on Windows
</span><span class="cx"> --wince Build the WinCE port
</span><span class="cx">
</span><del>- --inspector-frontend Copy changes to the inspector front-end files to the build directory
</del><ins>+ --inspector-frontend Copy Web Inspector user interface resources to the build directory
</ins><span class="cx">
</span><span class="cx"> --prefix=<path> Set installation prefix to the given path (Gtk/Efl only)
</span><span class="cx"> --makeargs=<arguments> Optional Makefile flags
</span><span class="lines">@@ -241,8 +241,7 @@
</span><span class="cx"> my $result = 0;
</span><span class="cx">
</span><span class="cx"> if (isInspectorFrontend()) {
</span><del>- $result = copyInspectorFrontendFiles();
- exit exitStatus($result) if exitStatus($result);
</del><ins>+ die "The --inspector-frontend option is not supported for CMake-based builds." if isCMakeBuild();
</ins><span class="cx"> @projects = ("Source/WebInspectorUI");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (173069 => 173070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-08-28 19:09:48 UTC (rev 173069)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-08-28 19:19:33 UTC (rev 173070)
</span><span class="lines">@@ -1674,65 +1674,6 @@
</span><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub copyInspectorFrontendFiles
-{
- my $productDir = productDir();
- my $sourceInspectorPath = sourceDir() . "/Source/WebCore/inspector/front-end/";
- my $inspectorResourcesDirPath = $ENV{"WEBKITINSPECTORRESOURCESDIR"};
-
- if (!defined($inspectorResourcesDirPath)) {
- $inspectorResourcesDirPath = "";
- }
-
- if (isAppleMacWebKit()) {
- if (isIOSWebKit()) {
- $inspectorResourcesDirPath = $productDir . "/WebCore.framework/inspector";
- } else {
- $inspectorResourcesDirPath = $productDir . "/WebCore.framework/Resources/inspector";
- }
- } elsif (isAppleWinWebKit() || isWinCairo()) {
- $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
- } elsif (isGtk()) {
- my $prefix = $ENV{"WebKitInstallationPrefix"};
- $inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/webkit-1.0/webinspector";
- } elsif (isEfl()) {
- my $prefix = $ENV{"WebKitInstallationPrefix"};
- $inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/ewebkit/webinspector";
- }
-
- if (! -d $inspectorResourcesDirPath) {
- print "*************************************************************\n";
- print "Cannot find '$inspectorResourcesDirPath'.\n" if (defined($inspectorResourcesDirPath));
- print "Make sure that you have built WebKit first.\n" if (! -d $productDir || defined($inspectorResourcesDirPath));
- print "Optionally, set the environment variable 'WebKitInspectorResourcesDir'\n";
- print "to point to the directory that contains the WebKit Inspector front-end\n";
- print "files for the built WebCore framework.\n";
- print "*************************************************************\n";
- die;
- }
-
- if (isAppleMacWebKit()) {
- my $sourceLocalizedStrings = sourceDir() . "/Source/WebCore/English.lproj/localizedStrings.js";
- my $destinationLocalizedStrings;
- if (isIOSWebKit()) {
- $destinationLocalizedStrings = $productDir . "/WebCore.framework/English.lproj/localizedStrings.js";
- } else {
- $destinationLocalizedStrings = $productDir . "/WebCore.framework/Resources/English.lproj/localizedStrings.js";
- }
- system "ditto", $sourceLocalizedStrings, $destinationLocalizedStrings;
- }
-
- my $exitStatus = system "rsync", "-aut", "--exclude=/.DS_Store", "--exclude=*.re2js", "--exclude=.svn/", $sourceInspectorPath, $inspectorResourcesDirPath;
- return $exitStatus if $exitStatus;
-
- if (isIOSWebKit()) {
- chdir($productDir . "/WebCore.framework");
- return system "zip", "--quiet", "--exclude=*.qrc", "-r", "inspector-remote.zip", "inspector";
- }
-
- return 0; # Success; did copy files.
-}
-
</del><span class="cx"> sub buildXCodeProject($$@)
</span><span class="cx"> {
</span><span class="cx"> my ($project, $clean, @extraOptions) = @_;
</span></span></pre>
</div>
</div>
</body>
</html>