Attachment 362345 Details for Bug 194795 – Patch

[patch] Patch

bug-194795-20190219101320.patch (text/plain), 4.46 KB, created by Dean Jackson on 2019-02-18 15:13:22 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2019-02-18 15:13:22 PST

Size: 4.46 KB

patch

obsolete

>Subversion Revision: 241740
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b9e2f12bcf7cbfdb382d49ba09c2c9d25ff09042..f41777ff1752b51227ab03b870f6417704d12e6c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-18  Dean Jackson  <dino@apple.com>
>+
>+        Clean-up output from generate-xcfilelists so it can be filtered
>+        https://bugs.webkit.org/show_bug.cgi?id=194795
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove the "..." and "===" from generate-xcfilelists output, and
>+        make a slight tweak to filter-build-webkit so such lines are marked
>+        as plain.
>+
>+        * Scripts/filter-build-webkit:
>+        * Scripts/generate-xcfilelists:
>+
> 2019-02-18  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix API test after r241728
>diff --git a/Tools/Scripts/filter-build-webkit b/Tools/Scripts/filter-build-webkit
>index 5b629ece5a74487b52d358c690c6857814988ee2..b7fe434798a7981c072e6f24a86c28ee6b4f7760 100755
>--- a/Tools/Scripts/filter-build-webkit
>+++ b/Tools/Scripts/filter-build-webkit
>@@ -160,13 +160,13 @@ for (my $previousLine = "", my $line = <>; $line; $previousLine = $line, $line =
>         printLine("$command $path", STYLE_PLAIN);
>     } elsif ($line =~ /^offlineasm\: /) {
>         printLine($line, STYLE_PLAIN);
>-    } elsif ($line =~ /^Generating (\S+) from (\S+)/) {
>-        printLine($line, STYLE_PLAIN);
>     } elsif ($line =~ /^Generating bindings for the (\S+) builtin\./) {
>         printLine("Generating $1 builtin", STYLE_PLAIN);
>     } elsif ($line =~ /^Generating (bindings|messages? (header|receiver|dispatcher)|derived source) for (\S+)\.\.\./) {
>         my ($command, $path) = ($1, basename($3));
>         printLine("Generating $command $path", STYLE_PLAIN);
>+    } elsif ($line =~ /^(Generating|Merging) (\S+) (from|for) (\S+)/) {
>+        printLine($line, STYLE_PLAIN);
>     } elsif ($line =~ /^Pre-processing (\S+) sandbox profile/) {
>         printLine($line, STYLE_PLAIN);
>     } elsif ($line =~ /^(\S+\/cc).*?(\S+)\.(out|exp)/) {
>diff --git a/Tools/Scripts/generate-xcfilelists b/Tools/Scripts/generate-xcfilelists
>index 6dc2722bfd276701cd100f81472a2f9eb03f6409..b2c0631d883636dcfde8125c369d5881ba39982e 100755
>--- a/Tools/Scripts/generate-xcfilelists
>+++ b/Tools/Scripts/generate-xcfilelists
>@@ -191,7 +191,6 @@ function cleanup()
>     fi
> }
> 
>-
> function my_exit()
> {
>     local GX_ERR=$1
>@@ -210,7 +209,7 @@ function die()
> 
> function log_debug()
> {
>-    (( "${GX_DEBUG}" > 0 )) && stderr "... $@"
>+    (( "${GX_DEBUG}" > 0 )) && stderr "$@"
> }
> 
> 
>@@ -235,14 +234,14 @@ function log_callstack_and_parameters()
>         local GX_ARGS=("$@")
>         local GX_CALLSTACK=("${FUNCNAME[@]}")
>         unset GX_CALLSTACK[0]
>-        stderr "... (${GX_CALLSTACK[@]}): ${GX_ARGS[@]}"
>+        stderr "(${GX_CALLSTACK[@]}): ${GX_ARGS[@]}"
>     fi
> }
> 
> 
> function log_progress()
> {
>-    stdout "... $@"
>+    stdout "$@"
> }
> 
> 
>@@ -1103,9 +1102,9 @@ function do_generate()
> 
>     if [[ -z "${GX_PROJECT_TAG}" ]]
>     then
>-        log_progress "=== Generating all .xcfilelists ==="
>+        log_progress "Generating all .xcfilelists"
>     else
>-        log_progress "=== Generating .xcfilelists for ${GX_PROJECT_TAG} ==="
>+        log_progress "Generating .xcfilelists for ${GX_PROJECT_TAG}"
>     fi
> 
>     for_each_project \
>@@ -1122,9 +1121,9 @@ function do_merge()
> 
>     if [[ -z "${GX_PROJECT_TAG}" ]]
>     then
>-        log_progress "=== Merging all .xcfilelists into place ==="
>+        log_progress "Merging all .xcfilelists into place"
>     else
>-        log_progress "=== Merging .xcfilelists for ${GX_PROJECT_TAG} ==="
>+        log_progress "Merging .xcfilelists for ${GX_PROJECT_TAG}"
>     fi
> 
>     for_each_project \
>@@ -1145,9 +1144,9 @@ function do_check()
> 
>     if [[ -z "${GX_PROJECT_TAG}" ]]
>     then
>-        log_progress "=== Checking all .xcfilelists ==="
>+        log_progress "Checking all .xcfilelists"
>     else
>-        log_progress "=== Checking .xcfilelists for ${GX_PROJECT_TAG} ==="
>+        log_progress "Checking .xcfilelists for ${GX_PROJECT_TAG}"
>     fi
> 
>     for_each_project \
>@@ -1165,7 +1164,7 @@ function do_subgenerate()
>     [[ -n "${GX_PROJECT_TAG}" ]] || die "GX_PROJECT_TAG is not defined."
>     [[ -n "${PROJECT_NAME}" ]] || die "subgenerate should only be invoked in an Xcode context."
> 
>-    log_progress "=== Generating .xcfilelists for ${PROJECT_NAME}/${PLATFORM_NAME}/${CONFIGURATION} ==="
>+    log_progress "Generating .xcfilelists for ${PROJECT_NAME}/${PLATFORM_NAME}/${CONFIGURATION}"
> 
>     set_project_settings
>

Flags:

joepeck: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 194795: 362345