<!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>[172610] 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/172610">172610</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-14 15:56:57 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172604">r172604</a>. <rdar://problem/18022221></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="#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 (172609 => 172610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-08-14 22:22:02 UTC (rev 172609)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-08-14 22:56:57 UTC (rev 172610)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-14 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172604
+
+ 2014-08-14 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Extend auto-version and version-stamp for RC_ProjectBuildVersion
+ https://bugs.webkit.org/show_bug.cgi?id=135948
+ <rdar://problem/18022221>
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: Add tests
+ for RC_ProjectBuildVersion.
+
</ins><span class="cx"> 2014-08-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171903. <rdar://problem/17885078>
</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 (172609 => 172610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-14 22:22:02 UTC (rev 172609)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-14 22:56:57 UTC (rev 172610)
</span><span class="lines">@@ -501,6 +501,144 @@
</span><span class="cx"> '__BUILD_NUMBER_VARIANT__' => '64099',
</span><span class="cx"> },
</span><span class="cx"> },
</span><ins>+
+ # Use RC_PROJECTBUILDVERSION or RC_ProjectBuildVersion if our submission version
+ # does not have 4 or more tuples.
+ {
+ 'RC_ProjectSourceVersion' => '7600.1',
+ 'RC_ProjectBuildVersion' => '26',
+ expectedResults => {
+ '__VERSION_TEXT__' => '600.1',
+ '__BUILD_NUMBER__' => '600.1',
+ '__BUILD_NUMBER_SHORT__' => '600.1',
+ '__VERSION_MAJOR__' => '600',
+ '__VERSION_MINOR__' => '1000',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '26',
+ '__BUILD_NUMBER_MAJOR__' => '600',
+ '__BUILD_NUMBER_MINOR__' => '1000',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '27',
+ 'RC_ProjectBuildVersion' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '27',
+ '__BUILD_NUMBER__' => '27',
+ '__BUILD_NUMBER_SHORT__' => '27',
+ '__VERSION_MAJOR__' => '27',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '14',
+ '__BUILD_NUMBER_MAJOR__' => '27',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '27',
+ 'RC_PROJECTBUILDVERSION' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '27',
+ '__BUILD_NUMBER__' => '27',
+ '__BUILD_NUMBER_SHORT__' => '27',
+ '__VERSION_MAJOR__' => '27',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '14',
+ '__BUILD_NUMBER_MAJOR__' => '27',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_PROJECTSOURCEVERSION' => '27',
+ 'RC_ProjectBuildVersion' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '27',
+ '__BUILD_NUMBER__' => '27',
+ '__BUILD_NUMBER_SHORT__' => '27',
+ '__VERSION_MAJOR__' => '27',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '14',
+ '__BUILD_NUMBER_MAJOR__' => '27',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
+ 'RC_ProjectBuildVersion' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3.2.1',
+ '__BUILD_NUMBER__' => '300.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2.1',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
+ 'RC_PROJECTBUILDVERSION' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3.2.1',
+ '__BUILD_NUMBER__' => '300.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2.1',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_PROJECTSOURCEVERSION' => '5300.4.3.2.1',
+ 'RC_ProjectBuildVersion' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3.2.1',
+ '__BUILD_NUMBER__' => '300.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2.1',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_PROJECTSOURCEVERSION' => '5300.4.3.2.1',
+ 'RC_PROJECTBUILDVERSION' => '14',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3.2.1',
+ '__BUILD_NUMBER__' => '300.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2.1',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> # This test should only be run on Windows
</span><span class="lines">@@ -517,8 +655,23 @@
</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>+ my $testFlags;
+ if ($testCase->{'RC_ProjectSourceVersion'}) {
+ $testFlags = " RC_ProjectSourceVersion=\"$testCase->{'RC_ProjectSourceVersion'}\"";
+ } elsif ($testCase->{'RC_PROJECTSOURCEVERSION'}) {
+ $testFlags = " RC_PROJECTSOURCEVERSION=\"$testCase->{'RC_PROJECTSOURCEVERSION'}\"";
+ } else {
+ die ("Missing the RC_ProjectSourceVersion environment variable.\n");
+ }
</ins><span class="cx">
</span><ins>+ if ($testCase->{'RC_ProjectBuildVersion'}) {
+ $testFlags .= " RC_ProjectBuildVersion=\"$testCase->{'RC_ProjectBuildVersion'}\"";
+ } elsif ($testCase->{'RC_PROJECTBUILDVERSION'}) {
+ $testFlags .= " RC_PROJECTBUILDVERSION=\"$testCase->{'RC_PROJECTBUILDVERSION'}\"";
+ }
+
+ `$testFlags perl $autoVersionScript $testOutputDir`;
+
</ins><span class="cx"> my $expectedResults = $testCase->{expectedResults};
</span><span class="cx">
</span><span class="cx"> my $outputFile = File::Spec->catfile($testOutputDir, 'include', 'autoversion.h');
</span><span class="lines">@@ -536,7 +689,11 @@
</span><span class="cx"> chomp($line);
</span><span class="cx">
</span><span class="cx"> my $expectedResultValue = $expectedResults->{$expectedResultKey};
</span><del>- is($line, $expectedResultValue, "$testCase->{'RC_ProjectSourceVersion'}: $expectedResultKey");
</del><ins>+ if ($testCase->{'RC_ProjectSourceVersion'}) {
+ is($line, $expectedResultValue, "$testCase->{'RC_ProjectSourceVersion'}: $expectedResultKey");
+ } else {
+ is($line, $expectedResultValue, "$testCase->{'RC_PROJECTSOURCEVERSION'}: $expectedResultKey");
+ }
</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 (172609 => 172610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-14 22:22:02 UTC (rev 172609)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-14 22:56:57 UTC (rev 172610)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-08-14 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172604
+
+ 2014-08-14 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Extend auto-version and version-stamp for RC_ProjectBuildVersion
+ https://bugs.webkit.org/show_bug.cgi?id=135948
+ <rdar://problem/18022221>
+
+ Reviewed by David Kilzer.
+
+ * win/tools/scripts/auto-version.pl:
+ (splitVersion): Use RC_ProjectBuildVersion (or RC_PROJECTBUILDVERSION) if set
+ in the environment as the 'Build Version', unless the multi-tuple version
+ supplied by RC_ProjectSourceVersion already has a fourth component.
+ * win/tools/scripts/version-stamp.pl: Check for RC_ProjectBuildVersion and
+ use it in preference to RC_PROJECTBUILDVERSION.
+
</ins><span class="cx"> 2014-08-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171903. <rdar://problem/17885078>
</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 (172609 => 172610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-14 22:22:02 UTC (rev 172609)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-14 22:56:57 UTC (rev 172610)
</span><span class="lines">@@ -62,12 +62,8 @@
</span><span class="cx">
</span><span class="cx"> # Take the initial version number from RC_ProjectSourceVersion if it
</span><span class="cx"> # exists, otherwise fall back to the version number stored in the source.
</span><del>-my $ENVIRONMENT_VERSION = $ENV{'RC_ProjectSourceVersion'};
-if (!defined $ENVIRONMENT_VERSION) {
- $ENVIRONMENT_VERSION = $ENV{'RC_PROJECTSOURCEVERSION'};
-}
-
-my $PROPOSED_VERSION = (defined $ENVIRONMENT_VERSION) ? $ENVIRONMENT_VERSION : $FALLBACK_VERSION;
</del><ins>+my $ENVIRONMENT_VERSION = $ENV{'RC_ProjectSourceVersion'} || $ENV{'RC_PROJECTSOURCEVERSION'};
+my $PROPOSED_VERSION = $ENVIRONMENT_VERSION || $FALLBACK_VERSION;
</ins><span class="cx"> chomp($PROPOSED_VERSION);
</span><span class="cx">
</span><span class="cx"> my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION) = splitVersion($PROPOSED_VERSION);
</span><span class="lines">@@ -153,7 +149,7 @@
</span><span class="cx"> $BUILD_MICRO_VERSION = $components[3];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $RETURN_NANO_VERSION = $BUILD_MICRO_VERSION;
</del><ins>+ my $RETURN_NANO_VERSION = $ENV{'RC_ProjectBuildVersion'} || $ENV{'RC_PROJECTBUILDVERSION'} || $BUILD_MICRO_VERSION;
</ins><span class="cx"> if ($componentCount > 4) {
</span><span class="cx"> $BUILD_NANO_VERSION = $components[4];
</span><span class="cx"> $RETURN_NANO_VERSION = $BUILD_NANO_VERSION;
</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 (172609 => 172610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-14 22:22:02 UTC (rev 172609)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-14 22:56:57 UTC (rev 172610)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
</span><span class="cx">
</span><span class="cx"> my $SAFE_PROJECT_VERSION = "$components{'__VERSION_MAJOR__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
</span><del>-my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
</del><ins>+my $SAFE_BUILD_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
</ins><span class="cx">
</span><span class="cx"> print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$SAFE_BUILD_VERSION\n";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>