<!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>[166878] trunk/Source/WebCore</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/166878">166878</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-04-07 12:37:14 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove copy of combine-javascript-resources.pl that isn't used anymore
https://bugs.webkit.org/show_bug.cgi?id=131307
Reviewed by Joseph Pecoraro.
* WebCore.xcodeproj/project.pbxproj:
* inspector/combine-javascript-resources.pl: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorcombinejavascriptresourcespl">trunk/Source/WebCore/inspector/combine-javascript-resources.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166877 => 166878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-07 18:45:22 UTC (rev 166877)
+++ trunk/Source/WebCore/ChangeLog 2014-04-07 19:37:14 UTC (rev 166878)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-07 Timothy Hatcher <timothy@apple.com>
+
+ Remove copy of combine-javascript-resources.pl that isn't used anymore
+ https://bugs.webkit.org/show_bug.cgi?id=131307
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/combine-javascript-resources.pl: Removed.
+
</ins><span class="cx"> 2014-04-07 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Clean up invalid FIXME
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166877 => 166878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-07 18:45:22 UTC (rev 166877)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-07 19:37:14 UTC (rev 166878)
</span><span class="lines">@@ -10770,7 +10770,6 @@
</span><span class="cx"> A584FE391864E2D800843B10 /* JSCommandLineAPIHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCommandLineAPIHost.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCommandLineAPIHost.h; sourceTree = "<group>"; };
</span><span class="cx"> A593CF7218402CE900BFCE27 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
</span><del>- A593CF7518402D4B00BFCE27 /* combine-javascript-resources.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = "combine-javascript-resources.pl"; sourceTree = "<group>"; };
</del><span class="cx"> A593CF8A1840535200BFCE27 /* InspectorWebAgentBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebAgentBase.h; sourceTree = "<group>"; };
</span><span class="cx"> A5A2AF091829734300DE1729 /* PageDebuggable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageDebuggable.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5A2AF0A1829734300DE1729 /* PageDebuggable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageDebuggable.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14950,7 +14949,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> A593CF7218402CE900BFCE27 /* protocol */,
</span><del>- A593CF7518402D4B00BFCE27 /* combine-javascript-resources.pl */,
</del><span class="cx"> A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */,
</span><span class="cx"> A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */,
</span><span class="cx"> A584FE331864D5AF00843B10 /* CommandLineAPIHost.idl */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorcombinejavascriptresourcespl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/combine-javascript-resources.pl (166877 => 166878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/combine-javascript-resources.pl 2014-04-07 18:45:22 UTC (rev 166877)
+++ trunk/Source/WebCore/inspector/combine-javascript-resources.pl 2014-04-07 19:37:14 UTC (rev 166878)
</span><span class="lines">@@ -1,81 +0,0 @@
</span><del>-#!/usr/bin/perl -w
-
-# Copyright (C) 2008 Apple Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Script to combine multiple JavaScript files into one file, based on
-# the script tags in the head of an input HTML file.
-
-use strict;
-use Getopt::Long;
-use File::Basename;
-use File::Path;
-
-my $generatedScriptsDirectory;
-my $outputDirectory;
-my $scriptName;
-my $htmlFile;
-
-GetOptions('output-dir=s' => \$outputDirectory,
- 'output-script-name=s' => \$scriptName,
- 'generated-scripts-dir=s' => \$generatedScriptsDirectory,
- 'input-html=s' => \$htmlFile);
-
-unless (defined $htmlFile and defined $scriptName and defined $outputDirectory) {
- print "Usage: $0 --input-html <path> --output-dir path --output-script-name <name>\n";
- exit;
-}
-
-my $htmlDirectory = dirname($htmlFile);
-my $htmlContents;
-
-{
- local $/;
- open HTML, $htmlFile or die;
- $htmlContents = <HTML>;
- close HTML;
-}
-
-$htmlContents =~ m/<head>(.*)<\/head>/si;
-my $headContents = $1;
-
-mkpath $outputDirectory;
-open SCRIPT_OUT, ">", "$outputDirectory/$scriptName" or die "Can't open $outputDirectory/$scriptName: $!";
-
-while ($headContents =~ m/<script.*src="([^"]*)"[^>]*>/gi) {
- local $/;
- open SCRIPT_IN, "$generatedScriptsDirectory/$1" or open SCRIPT_IN, "$htmlDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
- print SCRIPT_OUT "/* $1 */\n\n";
- print SCRIPT_OUT <SCRIPT_IN>;
- close SCRIPT_IN;
-}
-
-close SCRIPT_OUT;
-
-$headContents =~ s/<script.*src="[^"]*"[^>]*><\/script>\s*//gi;
-$headContents .= "<script type=\"text/javascript\" src=\"$scriptName\"></script>\n";
-$htmlContents =~ s/<head>.*<\/head>/<head>$headContents<\/head>/si;
-
-open HTML, ">", "$outputDirectory/" . basename($htmlFile) or die "Can't open $outputDirectory/" . basename($htmlFile) . ": $!";
-print HTML $htmlContents;
-close HTML;
</del></span></pre>
</div>
</div>
</body>
</html>