Changeset 177741 in webkit

Timestamp:

Dec 25, 2014, 2:45:31 PM (11 years ago)

Author:

mitz@apple.com

Message:

Give extract-localizable-strings an option to treat warnings as errors
​https://bugs.webkit.org/show_bug.cgi?id=139943

Reviewed by Darin Adler.

Add a --treat-warnings-as-errors option, which makes the script emit its warnings as errors
and exit with a non-0 return code if it emitted any warnings.

• extract-localizable-strings.pl:

Added $treatWarningsAsErrors variable, set to true if the option is passed in.

(emitWarning): Added. If $treatWarningsAsErrors is true, omits the "warning: " token from
the message, which makes it appear as an error in Xcode, and sets $sawError to 1.

Replaced all print statements that printed warnings with calls to emitWarning.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• extract-localizable-strings.pl (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-12-25  Dan Bernstein  <mitz@apple.com>
+
+        Give extract-localizable-strings an option to treat warnings as errors
+        https://bugs.webkit.org/show_bug.cgi?id=139943
+
+        Reviewed by Darin Adler.
+
+        Add a --treat-warnings-as-errors option, which makes the script emit its warnings as errors
+        and exit with a non-0 return code if it emitted any warnings.
+
+        * extract-localizable-strings.pl:
+        Added $treatWarningsAsErrors variable, set to true if the option is passed in.
+
+        (emitWarning): Added. If $treatWarningsAsErrors is true, omits the "warning: " token from
+        the message, which makes it appear as an error in Xcode, and sets $sawError to 1.
+
+        Replaced all print statements that printed warnings with calls to emitWarning.
+
 2014-12-25  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/extract-localizable-strings.pl ¶

@@ -54 +54 @@
 my $exceptionsFile;
 my @directoriesToSkip = ();
+my $treatWarningsAsErrors;
 
 my %options = (
@@ -59 +60 @@
     'exceptions=s' => \$exceptionsFile,
     'skip=s' => \@directoriesToSkip,
+    'treat-warnings-as-errors' => \$treatWarningsAsErrors,
 );
 
 GetOptions(%options);
 
-@ARGV >= 2 or die "Usage: extract-localizable-strings [--verify] [--exceptions <exceptions file>] <file to update> [--skip directory | directory]...\nDid you mean to run update-webkit-localizable-strings instead?\n";
+@ARGV >= 2 or die "Usage: extract-localizable-strings [--verify] [--treat-warnings-as-errors] [--exceptions <exceptions file>] <file to update> [--skip directory | directory]...\nDid you mean to run update-webkit-localizable-strings instead?\n";
 
 -f $exceptionsFile or die "Couldn't find exceptions file $exceptionsFile\n" unless !defined $exceptionsFile;
@@ -91 +93 @@
 my %usedException;
 
+sub emitWarning($$$)
+{
+    my ($file, $line, $message) = @_;
+    my $prefix = $treatWarningsAsErrors ? "" : "warning: ";
+    print "$file:$line: $prefix$message\n";
+    $sawError = 1 if $treatWarningsAsErrors;
+}
+
 if (defined $exceptionsFile && open EXCEPTIONS, $exceptionsFile) {
     while (<EXCEPTIONS>) {
@@ -96 +106 @@
         if (/^"([^\\"]|\\.)*"$/ or /^[-_\/\w\s.]+.(h|m|mm|c|cpp)$/ or /^[-_\/\w\s.]+.(h|m|mm|c|cpp):"([^\\"]|\\.)*"$/) {
             if ($exception{$_}) {
-                print "$exceptionsFile:$.: warning: exception for $_ appears twice\n";
-                print "$exceptionsFile:$exception{$_}: warning: first appearance\n";
+                emitWarning($exceptionsFile, $., "exception for $_ appears twice");
+                emitWarning($exceptionsFile, $exception{$_}, "first appearance");
             } else {
                 $exception{$_} = $.;
             }
         } else {
-            print "$exceptionsFile:$.: warning: syntax error\n";
+            emitWarning($exceptionsFile, $., "syntax error");
         }
     }
@@ -205 +215 @@
                         $usedException{"$file:\"$string\""} = 1;
                     } else {
-                        print "$file:$stringLine: warning: \"$string\" is not marked for localization\n" if $warnAboutUnlocalizedStrings;
+                        emitWarning($file, $stringLine, "\"$string\" is not marked for localization") if $warnAboutUnlocalizedStrings;
                         $notLocalizedCount++;
                     }
@@ -344 +354 @@
     
     if ($stringByKey{$key} && $stringByKey{$key} ne $string) {
-        print "$file:$line: warning: encountered the same key, \"$key\", twice, with different strings\n";
-        print "$fileByKey{$key}:$lineByKey{$key}: warning: previous occurrence\n";
+        emitWarning($file, $line, "encountered the same key, \"$key\", twice, with different strings");
+        emitWarning($fileByKey{$key}, $lineByKey{$key}, "previous occurrence");
         $keyCollisionCount++;
         return;
     }
     if ($commentByKey{$key} && $commentByKey{$key} ne $comment) {
-        print "$file:$line: warning: encountered the same key, \"$key\", twice, with different comments\n";
-        print "$fileByKey{$key}:$lineByKey{$key}: warning: previous occurrence\n";
+        emitWarning($file, $line, "encountered the same key, \"$key\", twice, with different comments");
+        emitWarning($fileByKey{$key}, $lineByKey{$key}, "previous occurrence");
         $keyCollisionCount++;
         return;
@@ -367 +377 @@
 if (@unusedExceptions) {
     for my $unused (@unusedExceptions) {
-        print "$exceptionsFile:$exception{$unused}: warning: exception $unused not used\n";
+        emitWarning($exceptionsFile, $exception{$unused}, "exception $unused not used");
     }
     print "\n";