<!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>[171330] tags/Safari-600.1.1.1</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/171330">171330</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-07-21 18:05:33 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171319">r171319</a>. <rdar://problem/17750334></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari600111ToolsChangeLog">tags/Safari-600.1.1.1/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari600111WebKitLibrariesChangeLog">tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog</a></li>
<li><a href="#tagsSafari600111WebKitLibrarieswintoolsscriptsautoversionpl">tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>tags/Safari-600.1.1.1/Tools/Scripts/webkitperl/auto-version_unittest/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari600111ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.1.1/Tools/ChangeLog (171329 => 171330)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.1.1/Tools/ChangeLog 2014-07-22 00:58:40 UTC (rev 171329)
+++ tags/Safari-600.1.1.1/Tools/ChangeLog 2014-07-22 01:05:33 UTC (rev 171330)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-21 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r171319.
+
+ 2014-07-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Extend auto-version.pl to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135124
+ <rdar://problem/17750334>
+
+ Reviewed by David Kilzer.
+
+ Add test cases for auto-version.pl.
+
+ * Scripts/webkitperl/auto-version_unittest: Added.
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: Added.
+
</ins><span class="cx"> 2014-07-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r171167. <rdar://problem/17716602>
</span></span></pre></div>
<a id="tagsSafari600111WebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog (171329 => 171330)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog 2014-07-22 00:58:40 UTC (rev 171329)
+++ tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog 2014-07-22 01:05:33 UTC (rev 171330)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-07-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171319.
+
+ 2014-07-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Extend auto-version.pl to handle 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135124
+ <rdar://problem/17750334>
+
+ Reviewed by David Kilzer.
+
+ Extend tuple parsing to handle up to five tuples, and as
+ few as a single tuple. On Windows, the two additional
+ tuples are unused.
+
+ Also corrected regular expression capture logic to use local
+ blocks, preventing later capture expressions from reusing
+ previous capture results when the current expression failed
+ to find a match (GRRR, Perl!).
+
+ Clean up code by putting logic into a couple of subroutines.
+
+ * win/tools/scripts/auto-version.pl:
+
+2014-07-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r171305.
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="tagsSafari600111WebKitLibrarieswintoolsscriptsautoversionpl"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl (171329 => 171330)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 00:58:40 UTC (rev 171329)
+++ tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 01:05:33 UTC (rev 171330)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><ins>+sub splitVersion($);
+sub splitBuildMajorVersion($);
+
</ins><span class="cx"> die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
</span><span class="cx">
</span><span class="cx"> my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
</span><span class="lines">@@ -68,47 +71,13 @@
</span><span class="cx"> my $PROPOSED_VERSION = (defined $ENVIRONMENT_VERSION) ? $ENVIRONMENT_VERSION : $FALLBACK_VERSION;
</span><span class="cx"> chomp($PROPOSED_VERSION);
</span><span class="cx">
</span><del>-# Split out the three components of the dotted version number. We pad
-# the input with trailing dots to handle the case where the input version
-# has fewer components than we expect.
-$PROPOSED_VERSION =~ m/^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/ or die "Couldn't parse $PROPOSED_VERSION";
-my $BUILD_MAJOR_VERSION = $1;
-my $BUILD_MINOR_VERSION = $2;
-my $BUILD_TINY_VERSION = $3;
</del><ins>+my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION) = splitVersion($PROPOSED_VERSION);
</ins><span class="cx">
</span><del>-# The default version (with no decimals) will be matched by the regexp
-# to $BUILD_TINY_VERSION. If that happens, we need to move it to
-# $BUILD_MAJOR_VERSION.
-if (!defined $BUILD_MAJOR_VERSION && !defined $BUILD_MINOR_VERSION) {
- $BUILD_MAJOR_VERSION = $BUILD_TINY_VERSION;
- $BUILD_TINY_VERSION = 0;
-}
-
-# Cut the major component down to three characters by dropping any
-# extra leading digits, then adjust the major version portion of the
-# version string to match.
-$BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
-
-# Have the minor and tiny components default to zero if not present.
-if (!defined $BUILD_MINOR_VERSION) {
- $BUILD_MINOR_VERSION = 0;
-}
-if (!defined $BUILD_TINY_VERSION) {
- $BUILD_TINY_VERSION = 0;
-}
-
</del><span class="cx"> $PROPOSED_VERSION = "$BUILD_MAJOR_VERSION.$BUILD_MINOR_VERSION.$BUILD_TINY_VERSION";
</span><span class="cx">
</span><del>-# Split the first component further by using the first digit for the
-# major version and the remaining two characters as the minor version.
-# The minor version is shifted down to the tiny version, with the tiny
-# version becoming the variant version.
-$BUILD_MAJOR_VERSION =~ m/^[^\d]*(\d)(\d{1,})/;
-my $MAJOR_VERSION = $1;
-my $MINOR_VERSION = $2;
</del><ins>+my ($MAJOR_VERSION, $MINOR_VERSION) = splitBuildMajorVersion($BUILD_MAJOR_VERSION);
</ins><span class="cx"> my $TINY_VERSION = $BUILD_MINOR_VERSION;
</span><span class="cx"> my $VARIANT_VERSION = $BUILD_TINY_VERSION;
</span><del>-
</del><span class="cx"> my $VERSION_TEXT = $PROPOSED_VERSION;
</span><span class="cx"> my $VERSION_TEXT_SHORT = $VERSION_TEXT;
</span><span class="cx">
</span><span class="lines">@@ -149,3 +118,54 @@
</span><span class="cx"> print OUTPUT_FILE "#define __COPYRIGHT_YEAR_END_TEXT__ \"$COPYRIGHT_END_YEAR\"\n";
</span><span class="cx"> }
</span><span class="cx"> close(OUTPUT_FILE);
</span><ins>+
+
+sub splitVersion($)
+{
+ my $PROPOSED_VERSION = shift;
+
+ # Split out the three components of the dotted version number. We pad
+ # the input with trailing dots to handle the case where the input version
+ # has fewer components than we expect.
+ my @components = split(/\./, $PROPOSED_VERSION) or die "Couldn't parse $PROPOSED_VERSION";
+ my $componentCount = scalar(@components);
+
+ my $BUILD_MAJOR_VERSION = $components[0];
+
+ # Have the minor and tiny components default to zero if not present.
+ my $BUILD_MINOR_VERSION = 0;
+ my $BUILD_TINY_VERSION = 0;
+ if ($componentCount > 1) {
+ $BUILD_MINOR_VERSION = $components[1];
+ if ($componentCount > 2) {
+ $BUILD_TINY_VERSION = $components[2];
+ }
+ }
+
+ # Cut the major component down to three characters by dropping any
+ # extra leading digits, then adjust the major version portion of the
+ # version string to match.
+ $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
+
+ return ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION);
+}
+
+sub splitBuildMajorVersion($)
+{
+ # Split the first component further by using the first digit for the
+ # major version and the remaining two characters as the minor version.
+ # The minor version is shifted down to the tiny version, with the tiny
+ # version becoming the variant version.
+ my ($MAJOR_VERSION, $MINOR_VERSION);
+ {
+ if ($BUILD_MAJOR_VERSION =~ m/^[^\d]*(\d)(\d{1,})/) {
+ $MAJOR_VERSION = $1;
+ $MINOR_VERSION = $2;
+ } else {
+ $MAJOR_VERSION = $BUILD_MAJOR_VERSION;
+ $MINOR_VERSION = '';
+ }
+ }
+
+ return ($MAJOR_VERSION, $MINOR_VERSION);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>