<!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>[177741] 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/177741">177741</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-12-25 14:45:31 -0800 (Thu, 25 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreextractlocalizablestringspl">trunk/Source/WebCore/extract-localizable-strings.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177740 => 177741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-25 22:01:19 UTC (rev 177740)
+++ trunk/Source/WebCore/ChangeLog 2014-12-25 22:45:31 UTC (rev 177741)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-12-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Bring the state of WEBCORE_EXPORT annotations closer to what the exports file specifies.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136172
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreextractlocalizablestringspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/extract-localizable-strings.pl (177740 => 177741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/extract-localizable-strings.pl 2014-12-25 22:01:19 UTC (rev 177740)
+++ trunk/Source/WebCore/extract-localizable-strings.pl 2014-12-25 22:45:31 UTC (rev 177741)
</span><span class="lines">@@ -53,16 +53,18 @@
</span><span class="cx"> my $verify;
</span><span class="cx"> my $exceptionsFile;
</span><span class="cx"> my @directoriesToSkip = ();
</span><ins>+my $treatWarningsAsErrors;
</ins><span class="cx">
</span><span class="cx"> my %options = (
</span><span class="cx"> 'verify' => \$verify,
</span><span class="cx"> 'exceptions=s' => \$exceptionsFile,
</span><span class="cx"> 'skip=s' => \@directoriesToSkip,
</span><ins>+ 'treat-warnings-as-errors' => \$treatWarningsAsErrors,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> GetOptions(%options);
</span><span class="cx">
</span><del>-@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";
</del><ins>+@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";
</ins><span class="cx">
</span><span class="cx"> -f $exceptionsFile or die "Couldn't find exceptions file $exceptionsFile\n" unless !defined $exceptionsFile;
</span><span class="cx">
</span><span class="lines">@@ -90,18 +92,26 @@
</span><span class="cx"> my %exception;
</span><span class="cx"> my %usedException;
</span><span class="cx">
</span><ins>+sub emitWarning($$$)
+{
+ my ($file, $line, $message) = @_;
+ my $prefix = $treatWarningsAsErrors ? "" : "warning: ";
+ print "$file:$line: $prefix$message\n";
+ $sawError = 1 if $treatWarningsAsErrors;
+}
+
</ins><span class="cx"> if (defined $exceptionsFile && open EXCEPTIONS, $exceptionsFile) {
</span><span class="cx"> while (<EXCEPTIONS>) {
</span><span class="cx"> chomp;
</span><span class="cx"> if (/^"([^\\"]|\\.)*"$/ or /^[-_\/\w\s.]+.(h|m|mm|c|cpp)$/ or /^[-_\/\w\s.]+.(h|m|mm|c|cpp):"([^\\"]|\\.)*"$/) {
</span><span class="cx"> if ($exception{$_}) {
</span><del>- print "$exceptionsFile:$.: warning: exception for $_ appears twice\n";
- print "$exceptionsFile:$exception{$_}: warning: first appearance\n";
</del><ins>+ emitWarning($exceptionsFile, $., "exception for $_ appears twice");
+ emitWarning($exceptionsFile, $exception{$_}, "first appearance");
</ins><span class="cx"> } else {
</span><span class="cx"> $exception{$_} = $.;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- print "$exceptionsFile:$.: warning: syntax error\n";
</del><ins>+ emitWarning($exceptionsFile, $., "syntax error");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close EXCEPTIONS;
</span><span class="lines">@@ -204,7 +214,7 @@
</span><span class="cx"> } elsif ($exception{"$file:\"$string\""}) {
</span><span class="cx"> $usedException{"$file:\"$string\""} = 1;
</span><span class="cx"> } else {
</span><del>- print "$file:$stringLine: warning: \"$string\" is not marked for localization\n" if $warnAboutUnlocalizedStrings;
</del><ins>+ emitWarning($file, $stringLine, "\"$string\" is not marked for localization") if $warnAboutUnlocalizedStrings;
</ins><span class="cx"> $notLocalizedCount++;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -343,14 +353,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($stringByKey{$key} && $stringByKey{$key} ne $string) {
</span><del>- print "$file:$line: warning: encountered the same key, \"$key\", twice, with different strings\n";
- print "$fileByKey{$key}:$lineByKey{$key}: warning: previous occurrence\n";
</del><ins>+ emitWarning($file, $line, "encountered the same key, \"$key\", twice, with different strings");
+ emitWarning($fileByKey{$key}, $lineByKey{$key}, "previous occurrence");
</ins><span class="cx"> $keyCollisionCount++;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if ($commentByKey{$key} && $commentByKey{$key} ne $comment) {
</span><del>- print "$file:$line: warning: encountered the same key, \"$key\", twice, with different comments\n";
- print "$fileByKey{$key}:$lineByKey{$key}: warning: previous occurrence\n";
</del><ins>+ emitWarning($file, $line, "encountered the same key, \"$key\", twice, with different comments");
+ emitWarning($fileByKey{$key}, $lineByKey{$key}, "previous occurrence");
</ins><span class="cx"> $keyCollisionCount++;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -366,7 +376,7 @@
</span><span class="cx"> my @unusedExceptions = sort grep { !$usedException{$_} } keys %exception;
</span><span class="cx"> if (@unusedExceptions) {
</span><span class="cx"> for my $unused (@unusedExceptions) {
</span><del>- print "$exceptionsFile:$exception{$unused}: warning: exception $unused not used\n";
</del><ins>+ emitWarning($exceptionsFile, $exception{$unused}, "exception $unused not used");
</ins><span class="cx"> }
</span><span class="cx"> print "\n";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>