<!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>[172987] branches/safari-600.1-branch</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/172987">172987</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-26 17:03:21 -0700 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172982">r172982</a>. <rdar://problem/18141695></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchToolsChangeLog">branches/safari-600.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001branchToolsScriptswebkitperlautoversion_unittestautoVersionTestspl">branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl</a></li>
<li><a href="#branchessafari6001branchToolsScriptswebkitperlautoversion_unittestversionStampTestspl">branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl</a></li>
<li><a href="#branchessafari6001branchWebKitLibrariesChangeLog">branches/safari-600.1-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari6001branchWebKitLibrarieswintoolsscriptsautoversionpl">branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl</a></li>
<li><a href="#branchessafari6001branchWebKitLibrarieswintoolsscriptsversionstamppl">branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/ChangeLog (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-08-26 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172982. <rdar://problem/18141695>
+
+ 2014-08-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Version stamp should include package-level version
+ https://bugs.webkit.org/show_bug.cgi?id=136266
+ <rdar://problem/18134138>
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: Add
+ tests for the full 3+ digit version.
+ * Scripts/webkitperl/auto-version_unittest/versionStampTests.pl:
+ Confirm that the final output DLL uses the 3+ digit version.
+
+2014-08-26 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172977. <rdar://problem/18141703>
</span><span class="cx">
</span><span class="cx"> 2014-08-26 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchToolsScriptswebkitperlautoversion_unittestautoVersionTestspl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -61,6 +62,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -77,6 +79,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '53',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -93,6 +96,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '5',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -109,6 +113,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -125,6 +130,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -141,6 +147,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '53',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -157,6 +164,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '5',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -173,6 +181,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -189,6 +198,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -205,6 +215,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '53',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -221,6 +232,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '5',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -237,6 +249,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4000',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -253,6 +266,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4000',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -269,6 +283,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '53',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4000',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -285,6 +300,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '5',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4000',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -301,6 +317,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -317,6 +334,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -333,6 +351,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '1001',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '1000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -349,6 +368,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '30020',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '10000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -365,6 +385,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64200',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -381,6 +402,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64999',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -397,6 +419,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '530',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64099',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '10000',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '7530',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -414,6 +437,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '53',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -431,6 +455,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '5',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -448,6 +473,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '747',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64999',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64999',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -465,6 +491,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '747',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64099',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64099',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -482,6 +509,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '747',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64099',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64099',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -499,6 +527,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '747',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '64099',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64099',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -518,6 +547,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '600',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '1000',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '7600',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -535,6 +565,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '27',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -552,6 +583,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '27',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -569,6 +601,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '27',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '0',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '0',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -586,6 +619,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -603,6 +637,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -620,6 +655,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -637,6 +673,7 @@
</span><span class="cx"> '__BUILD_NUMBER_MAJOR__' => '300',
</span><span class="cx"> '__BUILD_NUMBER_MINOR__' => '4003',
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '2001',
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx"> );
</span><span class="lines">@@ -648,7 +685,7 @@
</span><span class="cx"> exit 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-my $testCasesCount = scalar(@testCases) * 10; # 10 expected results
</del><ins>+my $testCasesCount = scalar(@testCases) * 11; # 11 expected results
</ins><span class="cx"> plan(tests => $testCasesCount);
</span><span class="cx">
</span><span class="cx"> foreach my $testCase (@testCases) {
</span></span></pre></div>
<a id="branchessafari6001branchToolsScriptswebkitperlautoversion_unittestversionStampTestspl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
</span><span class="cx"> 'RC_PROJECTBUILDVERSION' => undef,
</span><del>- expectedVersionResult => '300.4003.2001',
- expectedBuildVersionResult => 1,
</del><ins>+ 'expectedVersionResult' => '5300.4003.2001',
+ 'expectedBuildVersionResult' => 1,
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
</span><span class="cx"> 'RC_PROJECTBUILDVERSION' => 156,
</span><del>- expectedVersionResult => '300.4003.2001',
- expectedBuildVersionResult => 156,
</del><ins>+ 'expectedVersionResult' => '5300.4003.2001',
+ 'expectedBuildVersionResult' => 156,
</ins><span class="cx"> },
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-08-26 Dana Burkart <dburkart@apple.com>
+
+ Merge r172982. <rdar://problem/18141695>
+
+ 2014-08-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Version stamp should include package-level version
+ https://bugs.webkit.org/show_bug.cgi?id=136266
+ <rdar://problem/18134138>
+
+ Reviewed by David Kilzer.
+
+ * win/tools/scripts/auto-version.pl: Retain the full major build
+ version in addition to the three-digit value we use internally.
+ * win/tools/scripts/version-stamp.pl: Find and use the full 3+ digit
+ major build version when stamping the final output file.
+
+
</ins><span class="cx"> 2014-08-25 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172929
</span></span></pre></div>
<a id="branchessafari6001branchWebKitLibrarieswintoolsscriptsautoversionpl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> my $PROPOSED_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, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION) = splitVersion($PROPOSED_VERSION);
</del><ins>+my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION) = splitVersion($PROPOSED_VERSION);
</ins><span class="cx">
</span><span class="cx"> my $TINY_VERSION = $BUILD_TINY_VERSION;
</span><span class="cx"> my $VERSION_TEXT = $ADJUSTED_PROPOSED_VERSION;
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> #define __BUILD_NUMBER_MINOR__ $BUILD_MINOR_VERSION
</span><span class="cx"> #define __BUILD_NUMBER_VARIANT__ $BUILD_TINY_VERSION
</span><span class="cx"> #define __SVN_REVISION__ $SVN_REVISION
</span><ins>+#define __FULL_BUILD_MAJOR_VERSION__ $FULL_BUILD_MAJOR_VERSION
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> if (defined $COPYRIGHT_END_YEAR) {
</span><span class="lines">@@ -159,11 +160,12 @@
</span><span class="cx"> # extra leading digits, then adjust the major version portion of the
</span><span class="cx"> # version string to match.
</span><span class="cx"> my $originalLength = length($BUILD_MAJOR_VERSION);
</span><ins>+ my $FULL_BUILD_MAJOR_VERSION = $BUILD_MAJOR_VERSION;
</ins><span class="cx"> $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
</span><span class="cx">
</span><span class="cx"> my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
</span><span class="cx">
</span><span class="cx"> $PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
</span><span class="cx">
</span><del>- return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION);
</del><ins>+ return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchWebKitLibrarieswintoolsscriptsversionstamppl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl (172986 => 172987)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-27 00:03:21 UTC (rev 172987)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> '__VERSION_MINOR__' => undef,
</span><span class="cx"> '__VERSION_TINY__' => undef,
</span><span class="cx"> '__VERSION_BUILD__' => undef,
</span><ins>+ '__FULL_BUILD_MAJOR_VERSION__' => undef,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my $VERSION_FILE = File::Spec->catfile(File::Spec->canonpath($intdir), 'include', 'autoversion.h');
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
</span><span class="cx">
</span><del>-my $SAFE_PROJECT_VERSION = "$components{'__VERSION_MAJOR__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
</del><ins>+my $SAFE_PROJECT_VERSION = "$components{'__FULL_BUILD_MAJOR_VERSION__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
</ins><span class="cx"> my $SAFE_BUILD_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
</span><span class="cx">
</span><span class="cx"> print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$SAFE_BUILD_VERSION\n";
</span><span class="lines">@@ -99,9 +100,9 @@
</span><span class="cx"> $ENV{RC_PROJECTSOURCEVERSION} = $SAFE_PROJECT_VERSION;
</span><span class="cx"> $ENV{RC_ProjectSourceVersion} = $SAFE_PROJECT_VERSION;
</span><span class="cx">
</span><del>-my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__VERSION_MAJOR__'},
</del><ins>+my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__FULL_BUILD_MAJOR_VERSION__'},
</ins><span class="cx"> '--fileMinor', $components{'__VERSION_MINOR__'}, '--fileRevision', $components{'__VERSION_TINY__'},
</span><del>- '--fileBuild', $SAFE_BUILD_VERSION, '--productMajor', $components{'__VERSION_MAJOR__'},
</del><ins>+ '--fileBuild', $SAFE_BUILD_VERSION, '--productMajor', $components{'__FULL_BUILD_MAJOR_VERSION__'},
</ins><span class="cx"> '--productMinor', $components{'__VERSION_MINOR__'}, '--productRevision', $components{'__VERSION_TINY__'},
</span><span class="cx"> '--productBuild', $components{'__VERSION_BUILD__'});
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>