<!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>[171351] trunk</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/171351">171351</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 11:35:32 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct handling of __VERSION_TEXT__ for 4+-tuple versions
https://bugs.webkit.org/show_bug.cgi?id=135161
<rdar://problem/17763546>
Reviewed by David Kilzer.
Tools:
* Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl:
Add additional test cases to catch errors in multiple-tuple
version string handling.
WebKitLibraries:
Revise the auto-version.pl script to properly handle version
strings with 4 (or more) version tuples. Previously these were
being truncated from the version.
* win/tools/scripts/auto-version.pl:
(splitVersion): Return truncated version of
overall version string.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlautoversion_unittestautoVersionTestspl">trunk/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsscriptsautoversionpl">trunk/WebKitLibraries/win/tools/scripts/auto-version.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171350 => 171351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-22 18:27:17 UTC (rev 171350)
+++ trunk/Tools/ChangeLog 2014-07-22 18:35:32 UTC (rev 171351)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-22 Brent Fulgham <bfulgham@apple.com>
+
+ Correct handling of __VERSION_TEXT__ for 4+-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135161
+ <rdar://problem/17763546>
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl:
+ Add additional test cases to catch errors in multiple-tuple
+ version string handling.
+
</ins><span class="cx"> 2014-07-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Extend exception fuzzing to the LLInt
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlautoversion_unittestautoVersionTestspl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (171350 => 171351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-07-22 18:27:17 UTC (rev 171350)
+++ trunk/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-07-22 18:35:32 UTC (rev 171351)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '300.4.3',
- '__BUILD_NUMBER__' => '300.4.3',
- '__BUILD_NUMBER_SHORT__' => '300.4.3',
</del><ins>+ '__VERSION_TEXT__' => '300.4.3.2.1',
+ '__BUILD_NUMBER__' => '300.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2.1',
</ins><span class="cx"> '__VERSION_MAJOR__' => '3',
</span><span class="cx"> '__VERSION_MINOR__' => '00',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '530.4.3.2.1',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '530.4.3',
- '__BUILD_NUMBER__' => '530.4.3',
- '__BUILD_NUMBER_SHORT__' => '530.4.3',
</del><ins>+ '__VERSION_TEXT__' => '530.4.3.2.1',
+ '__BUILD_NUMBER__' => '530.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '530.4.3.2.1',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '30',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '53.4.3.2.1',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '53.4.3',
- '__BUILD_NUMBER__' => '53.4.3',
- '__BUILD_NUMBER_SHORT__' => '53.4.3',
</del><ins>+ '__VERSION_TEXT__' => '53.4.3.2.1',
+ '__BUILD_NUMBER__' => '53.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '53.4.3.2.1',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '3',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5.4.3.2.1',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '5.4.3',
- '__BUILD_NUMBER__' => '5.4.3',
- '__BUILD_NUMBER_SHORT__' => '5.4.3',
</del><ins>+ '__VERSION_TEXT__' => '5.4.3.2.1',
+ '__BUILD_NUMBER__' => '5.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '5.4.3.2.1',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300.4.3.2',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '300.4.3',
- '__BUILD_NUMBER__' => '300.4.3',
- '__BUILD_NUMBER_SHORT__' => '300.4.3',
</del><ins>+ '__VERSION_TEXT__' => '300.4.3.2',
+ '__BUILD_NUMBER__' => '300.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2',
</ins><span class="cx"> '__VERSION_MAJOR__' => '3',
</span><span class="cx"> '__VERSION_MINOR__' => '00',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -115,9 +115,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '530.4.3.2',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '530.4.3',
- '__BUILD_NUMBER__' => '530.4.3',
- '__BUILD_NUMBER_SHORT__' => '530.4.3',
</del><ins>+ '__VERSION_TEXT__' => '530.4.3.2',
+ '__BUILD_NUMBER__' => '530.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '530.4.3.2',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '30',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '53.4.3.2',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '53.4.3',
- '__BUILD_NUMBER__' => '53.4.3',
- '__BUILD_NUMBER_SHORT__' => '53.4.3',
</del><ins>+ '__VERSION_TEXT__' => '53.4.3.2',
+ '__BUILD_NUMBER__' => '53.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '53.4.3.2',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '3',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -147,9 +147,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5.4.3.2',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '5.4.3',
- '__BUILD_NUMBER__' => '5.4.3',
- '__BUILD_NUMBER_SHORT__' => '5.4.3',
</del><ins>+ '__VERSION_TEXT__' => '5.4.3.2',
+ '__BUILD_NUMBER__' => '5.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '5.4.3.2',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -227,9 +227,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300.4',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '300.4.0',
- '__BUILD_NUMBER__' => '300.4.0',
- '__BUILD_NUMBER_SHORT__' => '300.4.0',
</del><ins>+ '__VERSION_TEXT__' => '300.4',
+ '__BUILD_NUMBER__' => '300.4',
+ '__BUILD_NUMBER_SHORT__' => '300.4',
</ins><span class="cx"> '__VERSION_MAJOR__' => '3',
</span><span class="cx"> '__VERSION_MINOR__' => '00',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -243,9 +243,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '530.4',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '530.4.0',
- '__BUILD_NUMBER__' => '530.4.0',
- '__BUILD_NUMBER_SHORT__' => '530.4.0',
</del><ins>+ '__VERSION_TEXT__' => '530.4',
+ '__BUILD_NUMBER__' => '530.4',
+ '__BUILD_NUMBER_SHORT__' => '530.4',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '30',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -259,9 +259,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '53.4',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '53.4.0',
- '__BUILD_NUMBER__' => '53.4.0',
- '__BUILD_NUMBER_SHORT__' => '53.4.0',
</del><ins>+ '__VERSION_TEXT__' => '53.4',
+ '__BUILD_NUMBER__' => '53.4',
+ '__BUILD_NUMBER_SHORT__' => '53.4',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '3',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -275,9 +275,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5.4',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '5.4.0',
- '__BUILD_NUMBER__' => '5.4.0',
- '__BUILD_NUMBER_SHORT__' => '5.4.0',
</del><ins>+ '__VERSION_TEXT__' => '5.4',
+ '__BUILD_NUMBER__' => '5.4',
+ '__BUILD_NUMBER_SHORT__' => '5.4',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '',
</span><span class="cx"> '__VERSION_TINY__' => '4',
</span><span class="lines">@@ -291,9 +291,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '300.0.0',
- '__BUILD_NUMBER__' => '300.0.0',
- '__BUILD_NUMBER_SHORT__' => '300.0.0',
</del><ins>+ '__VERSION_TEXT__' => '300',
+ '__BUILD_NUMBER__' => '300',
+ '__BUILD_NUMBER_SHORT__' => '300',
</ins><span class="cx"> '__VERSION_MAJOR__' => '3',
</span><span class="cx"> '__VERSION_MINOR__' => '00',
</span><span class="cx"> '__VERSION_TINY__' => '0',
</span><span class="lines">@@ -307,9 +307,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '530',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '530.0.0',
- '__BUILD_NUMBER__' => '530.0.0',
- '__BUILD_NUMBER_SHORT__' => '530.0.0',
</del><ins>+ '__VERSION_TEXT__' => '530',
+ '__BUILD_NUMBER__' => '530',
+ '__BUILD_NUMBER_SHORT__' => '530',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '30',
</span><span class="cx"> '__VERSION_TINY__' => '0',
</span><span class="lines">@@ -320,13 +320,125 @@
</span><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ {
+ 'RC_ProjectSourceVersion' => '10530.1.1.1',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.1.1.1',
+ '__BUILD_NUMBER__' => '530.1.1.1',
+ '__BUILD_NUMBER_SHORT__' => '530.1.1.1',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '1',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '1',
+ '__BUILD_NUMBER_VARIANT__' => '1',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '10530.30.20.10',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.30.20.10',
+ '__BUILD_NUMBER__' => '530.30.20.10',
+ '__BUILD_NUMBER_SHORT__' => '530.30.20.10',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '30',
+ '__VERSION_BUILD__' => '20',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '30',
+ '__BUILD_NUMBER_VARIANT__' => '20',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '10530.300.200.100',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.300.200.100',
+ '__BUILD_NUMBER__' => '530.300.200.100',
+ '__BUILD_NUMBER_SHORT__' => '530.300.200.100',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '300',
+ '__VERSION_BUILD__' => '200',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '300',
+ '__BUILD_NUMBER_VARIANT__' => '200',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '10530.3000.2000.1000',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.3000.2000.1000',
+ '__BUILD_NUMBER__' => '530.3000.2000.1000',
+ '__BUILD_NUMBER_SHORT__' => '530.3000.2000.1000',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '3000',
+ '__VERSION_BUILD__' => '2000',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '3000',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '7530.3000.2000.1000',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.3000.2000.1000',
+ '__BUILD_NUMBER__' => '530.3000.2000.1000',
+ '__BUILD_NUMBER_SHORT__' => '530.3000.2000.1000',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '3000',
+ '__VERSION_BUILD__' => '2000',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '3000',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '7530.300.200.100',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.300.200.100',
+ '__BUILD_NUMBER__' => '530.300.200.100',
+ '__BUILD_NUMBER_SHORT__' => '530.300.200.100',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '300',
+ '__VERSION_BUILD__' => '200',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '300',
+ '__BUILD_NUMBER_VARIANT__' => '200',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '7530.30.20.10',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.30.20.10',
+ '__BUILD_NUMBER__' => '530.30.20.10',
+ '__BUILD_NUMBER_SHORT__' => '530.30.20.10',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '30',
+ '__VERSION_TINY__' => '30',
+ '__VERSION_BUILD__' => '20',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '30',
+ '__BUILD_NUMBER_VARIANT__' => '20',
+ },
+ },
+
</ins><span class="cx"> # Smallest "Valid" case
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '53',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '53.0.0',
- '__BUILD_NUMBER__' => '53.0.0',
- '__BUILD_NUMBER_SHORT__' => '53.0.0',
</del><ins>+ '__VERSION_TEXT__' => '53',
+ '__BUILD_NUMBER__' => '53',
+ '__BUILD_NUMBER_SHORT__' => '53',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '3',
</span><span class="cx"> '__VERSION_TINY__' => '0',
</span><span class="lines">@@ -341,9 +453,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '5.0.0',
- '__BUILD_NUMBER__' => '5.0.0',
- '__BUILD_NUMBER_SHORT__' => '5.0.0',
</del><ins>+ '__VERSION_TEXT__' => '5',
+ '__BUILD_NUMBER__' => '5',
+ '__BUILD_NUMBER_SHORT__' => '5',
</ins><span class="cx"> '__VERSION_MAJOR__' => '5',
</span><span class="cx"> '__VERSION_MINOR__' => '',
</span><span class="cx"> '__VERSION_TINY__' => '0',
</span><span class="lines">@@ -358,9 +470,9 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '214747.99.99.99.99',
</span><span class="cx"> expectedResults => {
</span><del>- '__VERSION_TEXT__' => '747.99.99',
- '__BUILD_NUMBER__' => '747.99.99',
- '__BUILD_NUMBER_SHORT__' => '747.99.99',
</del><ins>+ '__VERSION_TEXT__' => '747.99.99.99.99',
+ '__BUILD_NUMBER__' => '747.99.99.99.99',
+ '__BUILD_NUMBER_SHORT__' => '747.99.99.99.99',
</ins><span class="cx"> '__VERSION_MAJOR__' => '7',
</span><span class="cx"> '__VERSION_MINOR__' => '47',
</span><span class="cx"> '__VERSION_TINY__' => '99',
</span><span class="lines">@@ -370,6 +482,57 @@
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '99',
</span><span class="cx"> },
</span><span class="cx"> },
</span><ins>+
+ # Leading Whitespace
+ {
+ 'RC_ProjectSourceVersion' => ' 214747.99.99.99.99',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.99.99.99.99',
+ '__BUILD_NUMBER__' => '747.99.99.99.99',
+ '__BUILD_NUMBER_SHORT__' => '747.99.99.99.99',
+ '__VERSION_MAJOR__' => '7',
+ '__VERSION_MINOR__' => '47',
+ '__VERSION_TINY__' => '99',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '99',
+ '__BUILD_NUMBER_VARIANT__' => '99',
+ },
+ },
+
+ # Trailing Whitespace
+ {
+ 'RC_ProjectSourceVersion' => '214747.99.99.99.99 ',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.99.99.99.99',
+ '__BUILD_NUMBER__' => '747.99.99.99.99',
+ '__BUILD_NUMBER_SHORT__' => '747.99.99.99.99',
+ '__VERSION_MAJOR__' => '7',
+ '__VERSION_MINOR__' => '47',
+ '__VERSION_TINY__' => '99',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '99',
+ '__BUILD_NUMBER_VARIANT__' => '99',
+ },
+ },
+
+ # Leading and Trailing Whitespace
+ {
+ 'RC_ProjectSourceVersion' => ' 214747.99.99.99.99 ',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.99.99.99.99',
+ '__BUILD_NUMBER__' => '747.99.99.99.99',
+ '__BUILD_NUMBER_SHORT__' => '747.99.99.99.99',
+ '__VERSION_MAJOR__' => '7',
+ '__VERSION_MINOR__' => '47',
+ '__VERSION_TINY__' => '99',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '99',
+ '__BUILD_NUMBER_VARIANT__' => '99',
+ },
+ },
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> # This test should only be run on Windows
</span><span class="lines">@@ -386,7 +549,7 @@
</span><span class="cx"> my $toolsPath = $ENV{'WEBKIT_LIBRARIES'};
</span><span class="cx"> my $autoVersionScript = File::Spec->catfile($toolsPath, 'tools', 'scripts', 'auto-version.pl');
</span><span class="cx"> my $testOutputDir = tempdir(CLEANUP => 1);
</span><del>- `RC_ProjectSourceVersion=$testCase->{'RC_ProjectSourceVersion'} perl $autoVersionScript $testOutputDir`;
</del><ins>+ `RC_ProjectSourceVersion="$testCase->{'RC_ProjectSourceVersion'}" perl $autoVersionScript $testOutputDir`;
</ins><span class="cx">
</span><span class="cx"> my $expectedResults = $testCase->{expectedResults};
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (171350 => 171351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-07-22 18:27:17 UTC (rev 171350)
+++ trunk/WebKitLibraries/ChangeLog 2014-07-22 18:35:32 UTC (rev 171351)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-22 Brent Fulgham <bfulgham@apple.com>
+
+ Correct handling of __VERSION_TEXT__ for 4+-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135161
+ <rdar://problem/17763546>
+
+ Reviewed by David Kilzer.
+
+ Revise the auto-version.pl script to properly handle version
+ strings with 4 (or more) version tuples. Previously these were
+ being truncated from the version.
+
+ * win/tools/scripts/auto-version.pl:
+ (splitVersion): Return truncated version of
+ overall version string.
+
</ins><span class="cx"> 2014-07-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Extend auto-version.pl to handle 5-tuple versions
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsscriptsautoversionpl"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/scripts/auto-version.pl (171350 => 171351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 18:27:17 UTC (rev 171350)
+++ trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 18:35:32 UTC (rev 171351)
</span><span class="lines">@@ -71,14 +71,12 @@
</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>-my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION) = splitVersion($PROPOSED_VERSION);
</del><ins>+my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $ADJUSTED_PROPOSED_VERSION) = splitVersion($PROPOSED_VERSION);
</ins><span class="cx">
</span><del>-$PROPOSED_VERSION = "$BUILD_MAJOR_VERSION.$BUILD_MINOR_VERSION.$BUILD_TINY_VERSION";
-
</del><span class="cx"> my ($MAJOR_VERSION, $MINOR_VERSION) = splitBuildMajorVersion($BUILD_MAJOR_VERSION);
</span><span class="cx"> my $TINY_VERSION = $BUILD_MINOR_VERSION;
</span><span class="cx"> my $VARIANT_VERSION = $BUILD_TINY_VERSION;
</span><del>-my $VERSION_TEXT = $PROPOSED_VERSION;
</del><ins>+my $VERSION_TEXT = $ADJUSTED_PROPOSED_VERSION;
</ins><span class="cx"> my $VERSION_TEXT_SHORT = $VERSION_TEXT;
</span><span class="cx">
</span><span class="cx"> my $SVN_REVISION = '';
</span><span class="lines">@@ -124,9 +122,10 @@
</span><span class="cx"> {
</span><span class="cx"> my $PROPOSED_VERSION = shift;
</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.
</del><ins>+ $PROPOSED_VERSION =~ s/^\s+//g; # Get rid of any leading whitespace
+ $PROPOSED_VERSION =~ s/\s+$//g; # Get rid of any trailing whitespace
+
+ # Split out the components of the dotted version number.
</ins><span class="cx"> my @components = split(/\./, $PROPOSED_VERSION) or die "Couldn't parse $PROPOSED_VERSION";
</span><span class="cx"> my $componentCount = scalar(@components);
</span><span class="cx">
</span><span class="lines">@@ -145,9 +144,14 @@
</span><span class="cx"> # Cut the major component down to three characters by dropping any
</span><span class="cx"> # extra leading digits, then adjust the major version portion of the
</span><span class="cx"> # version string to match.
</span><ins>+ my $originalLength = length($BUILD_MAJOR_VERSION);
</ins><span class="cx"> $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
</span><span class="cx">
</span><del>- return ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION);
</del><ins>+ my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
+
+ $PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
+
+ return ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $PROPOSED_VERSION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub splitBuildMajorVersion($)
</span></span></pre>
</div>
</div>
</body>
</html>