Modified: trunk/Tools/ChangeLog (109974 => 109975)
--- trunk/Tools/ChangeLog 2012-03-07 00:24:39 UTC (rev 109974)
+++ trunk/Tools/ChangeLog 2012-03-07 00:33:12 UTC (rev 109975)
@@ -1,3 +1,16 @@
+2012-03-06 Dean Jackson <[email protected]>
+
+ filter-build-webkit needs more filters
+ https://bugs.webkit.org/show_bug.cgi?id=80440
+
+ Reviewed by Joseph Pecoraro.
+
+ Added as many missing filters as I could find for Apple
+ builds. Plus a few minor style updates.
+
+ * Scripts/filter-build-webkit:
+ (printLine):
+
2012-03-06 Ojan Vafai <[email protected]>
Copying old baselines throws an error if the new directory doesn't exist
Modified: trunk/Tools/Scripts/filter-build-webkit (109974 => 109975)
--- trunk/Tools/Scripts/filter-build-webkit 2012-03-07 00:24:39 UTC (rev 109974)
+++ trunk/Tools/Scripts/filter-build-webkit 2012-03-07 00:33:12 UTC (rev 109975)
@@ -34,12 +34,12 @@
use Getopt::Long;
use VCSUtils;
-use constant {
+use constant {
STYLE_PLAIN => 0,
STYLE_HEADER => 1,
STYLE_SUCCESS => 2,
STYLE_ALERT => 3,
-
+
HTML_HEADER =><<HTMLHEADER,
<html>
<head>
@@ -121,7 +121,7 @@
my $buildFailed = 0;
while (my $line = <>) {
print UNFILTERED_OUTPUT_HANDLE $line if $logUnfilteredOutput;
-
+
chomp($line);
next if $line =~ /^\s*$/;
@@ -138,6 +138,9 @@
next if $line =~ /^# Lower case all the values, as CSS values are case-insensitive$/;
next if $line =~ /^if sort /;
next if $line =~ /^ /;
+ next if $line =~ /^printf /;
+ next if $line =~ /^offlineasm: Nothing changed/;
+ next if $line =~ /^Showing first/;
if ($line =~ /^={10}/) {
printLine($line, STYLE_SUCCESS);
@@ -148,9 +151,21 @@
printLine($line, STYLE_PLAIN);
} elsif ($line =~ /\*\* BUILD SUCCEEDED \*\*/) {
printLine("Build Succeeded", STYLE_SUCCESS);
- } elsif ($line =~ /^(PhaseScriptExecution|CompileC|Distributed-CompileC|Ld|PBXCp|CpResource|CopyPNGFile|CopyTiffFile|CpHeader|Processing|ProcessInfoPlistFile|ProcessPCH|ProcessPCH\+\+|Touch|Libtool|CopyStringsFile|Mig|CreateUniversalBinary|Analyze) ("[^"]+"|\S+)/) {
+ } elsif ($line =~ /^(PhaseScriptExecution|CompileC|Distributed-CompileC|Ld|PBXCp|CpResource|CopyPNGFile|CopyTiffFile|CpHeader|Processing|ProcessInfoPlistFile|ProcessPCH|ProcessPCH\+\+|Touch|Libtool|CopyStringsFile|Mig|CreateUniversalBinary|Analyze|ProcessProductPackaging|CodeSign|SymLink|Updating|CompileXIB|StripNIB|CopyPlistFile|GenerateDSYMFile) ("[^"]+"|\S+)?/) {
my ($command, $path) = ($1, basename($2));
+ $path =~ s/"//g;
printLine("$command $path", STYLE_PLAIN);
+ } elsif ($line =~ /^\/\S+?(strip|WebCoreExportFileGenerator) .*?(\/|\> )(\S+)/) {
+ my ($command, $path) = (basename($1), basename($3));
+ printLine("$command $path", STYLE_PLAIN);
+ } elsif ($line =~ /^offlineasm\: /) {
+ printLine($line, STYLE_PLAIN);
+ } elsif ($line =~ /^Generating message.*(header|receiver) for (\S+)\.\.\./) {
+ my ($command, $path) = ($1, basename($2));
+ printLine("Generating message $command $path", STYLE_PLAIN);
+ } elsif ($line =~ /^(\S+\/cc).*?(\S+)\.(out|exp)/) {
+ my ($command, $path) = (basename($1), basename($2));
+ printLine("$command $path", STYLE_PLAIN);
} else {
# This only gets hit if stderr is redirected to stdout.
if ($line =~ /\*\* BUILD FAILED \*\*/) {
@@ -170,7 +185,7 @@
sub printLine($$)
{
my ($line, $style) = @_;
-
+
if ($outputFormat eq "html") {
$line = escapeHTML($line);
if ($style == STYLE_HEADER) { print OUTPUT_HANDLE "<h2>$line</h2>"; }
