Add some new patterns to filter-build-webkit

https://bugs.webkit.org/show_bug.cgi?id=170429

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-04-03
Reviewed by Alexey Proskuryakov.

* Scripts/filter-build-webkit:
(setOutputFormatOption):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@214866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 041a6cd..afa9db3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2017-04-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Add some new patterns to filter-build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=170429
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/filter-build-webkit:
+        (setOutputFormatOption):
+

 2017-04-03  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Data interaction should register type identifiers in order of priority
 2017-04-03  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Data interaction should register type identifiers in order of priority

diff --git a/Tools/Scripts/filter-build-webkit b/Tools/Scripts/filter-build-webkit
index 920d0ad..41ce017 100755 (executable)
--- a/Tools/Scripts/filter-build-webkit
+++ b/Tools/Scripts/filter-build-webkit
@@ -138,11 +138,11 @@ for (my $previousLine = "", my $line = <>; $line; $previousLine = $line, $line =
         $buildFinished = 1;
     } elsif ($line =~ /^===/) {
         printLine($line, STYLE_HEADER);
         $buildFinished = 1;
     } elsif ($line =~ /^===/) {
         printLine($line, STYLE_HEADER);

-    } elsif ($line =~ /Checking Dependencies|Check dependencies|Create product structure|Write auxiliary files/) {
+    } elsif ($line =~ /Checking Dependencies|Check dependencies|Create product structure|Write auxiliary files|LinkStoryboards/) {

         printLine($line, STYLE_PLAIN);
     } elsif ($line =~ /\*\* BUILD SUCCEEDED \*\*/) {
         printLine("Build Succeeded", STYLE_SUCCESS);
         printLine($line, STYLE_PLAIN);
     } elsif ($line =~ /\*\* BUILD SUCCEEDED \*\*/) {
         printLine("Build Succeeded", STYLE_SUCCESS);

-    } elsif ($line =~ /^(\e\[1m)?(PhaseScriptExecution|ClCompile|CompileC|Distributed-CompileC|Ld|PBXCp|CpResource|CopyPNGFile|CopyTiffFile|CpHeader|Preprocess|Processing|ProcessInfoPlistFile|ProcessPCH|ProcessPCH\+\+|Touch|Libtool|CopyStringsFile|Mig|CreateUniversalBinary|Analyze|AnalyzeShallow|ProcessProductPackaging|CodeSign|SymLink|Updating|CompileDTraceScript|CompileXIB|StripNIB|CopyPlistFile|GenerateDSYMFile|ExternalBuildToolExecution)(\e\[0m)? ("[^"]+"|(\\|(?<=\\)\s|\S)+)?/) {
+    } elsif ($line =~ /^(\e\[1m)?(PhaseScriptExecution|ClCompile|CompileC|Distributed-CompileC|Ld|PBXCp|CpResource|CopyPNGFile|CopyTiffFile|CpHeader|Preprocess|Processing|ProcessInfoPlistFile|ProcessPCH|ProcessPCH\+\+|Touch|Libtool|CopyStringsFile|Mig|CreateUniversalBinary|Analyze|AnalyzeShallow|ProcessProductPackaging|CodeSign|Validate|SymLink|Updating|CompileDTraceScript|CompileXIB|StripNIB|CopyPlistFile|GenerateDSYMFile|GenerateTAPI|CompileStoryboard|ExternalBuildToolExecution)(\e\[0m)? ("[^"]+"|(\\|(?<=\\)\s|\S)+)?/) {

         my ($command, $path) = ($2, basename($4));
         $path =~ s/("|\\|\.[ah]$)//g;
         printLine("$command $path", STYLE_PLAIN);
         my ($command, $path) = ($2, basename($4));
         $path =~ s/("|\\|\.[ah]$)//g;
         printLine("$command $path", STYLE_PLAIN);


@@ -235,7 +235,7 @@ sub shouldIgnoreLine($$)
 
     return 1 if $line =~ /^\s*$/;
     return 1 if $line =~ /^Build settings from command line:/;
 
     return 1 if $line =~ /^\s*$/;
     return 1 if $line =~ /^Build settings from command line:/;

-    return 1 if $line =~ /make: Nothing to be done for `all'\./;
+    return 1 if $line =~ /make(\[\d+\])?: Nothing to be done for `all'\./;

     return 1 if $line =~ /^JavaScriptCore\/create_hash_table/;
     return 1 if $line =~ /JavaScriptCore.framework\/PrivateHeaders\/create_hash_table/;
     return 1 if $line =~ /^JavaScriptCore\/pcre\/dftables/;
     return 1 if $line =~ /^JavaScriptCore\/create_hash_table/;
     return 1 if $line =~ /JavaScriptCore.framework\/PrivateHeaders\/create_hash_table/;
     return 1 if $line =~ /^JavaScriptCore\/pcre\/dftables/;