<!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>[172489] 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/172489">172489</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 13:46:18 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171903">r171903</a>. <rdar://problem/17885078></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchToolsChangeLog">branches/safari-600.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001branchWebKitLibrariesChangeLog">branches/safari-600.1-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari6001branchWebKitLibrarieswintoolsscriptsversionstamppl">branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchToolsScriptswebkitperlautoversion_unittestversionStampTestspl">branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.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 (172488 => 172489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-08-12 20:43:37 UTC (rev 172488)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-08-12 20:46:18 UTC (rev 172489)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171903. <rdar://problem/17885078>
+
+ 2014-07-31 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use RC_PROJECTBUILDVERSION as build portion of version
+ https://bugs.webkit.org/show_bug.cgi?id=135478
+
+ Reviewed by David Kilzer.
+
+ Add new test suite for the version-stamp program.
+
+ * Scripts/webkitperl/auto-version_unittest/versionStampTests.pl: Added.
+
</ins><span class="cx"> 2014-07-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171825
</span></span></pre></div>
<a id="branchessafari6001branchToolsScriptswebkitperlautoversion_unittestversionStampTestsplfromrev171903trunkToolsScriptswebkitperlautoversion_unittestversionStampTestspl"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl (from rev 171903, trunk/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl) (0 => 172489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl (rev 0)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-08-12 20:46:18 UTC (rev 172489)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+use strict;
+use warnings;
+
+use File::Spec;
+use File::Temp qw/ tempdir /;
+
+use Test::More;
+
+my @testCases =
+(
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
+ 'RC_PROJECTBUILDVERSION' => undef,
+ expectedVersionResult => '300.4003.2001',
+ expectedBuildVersionResult => 1,
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3.2.1',
+ 'RC_PROJECTBUILDVERSION' => 156,
+ expectedVersionResult => '300.4003.2001',
+ expectedBuildVersionResult => 156,
+ },
+);
+
+# This test should only be run on Windows
+if ($^O ne 'MSWin32' && $^O ne 'cygwin') {
+ plan(tests => 1);
+ is(1, 1, 'do nothing for non-Windows builds.');
+ exit 0;
+}
+
+my $testCasesCount = scalar(@testCases) * 2;
+plan(tests => $testCasesCount);
+
+my $TOOLS_PATH = $ENV{'WEBKIT_LIBRARIES'};
+my $AUTO_VERSION_SCRIPT = File::Spec->catfile($TOOLS_PATH, 'tools', 'scripts', 'auto-version.pl');
+my $VERSION_STAMP_SCRIPT = File::Spec->catfile($TOOLS_PATH, 'tools', 'scripts', 'version-stamp.pl');
+
+foreach my $testCase (@testCases) {
+ my $testOutputDir = tempdir(CLEANUP => 1);
+ `RC_ProjectSourceVersion="$testCase->{'RC_ProjectSourceVersion'}" perl $AUTO_VERSION_SCRIPT $testOutputDir`;
+
+ my $command;
+ if (defined($testCase->{'RC_PROJECTBUILDVERSION'})) {
+ $command="RC_PROJECTBUILDVERSION=\"$testCase->{'RC_PROJECTBUILDVERSION'}\" ";
+ }
+ $command .= "perl $VERSION_STAMP_SCRIPT $testOutputDir $testOutputDir";
+
+ my @versionStamperOutput = qx($command 2>&1);
+
+ foreach my $line (@versionStamperOutput) {
+ if ($line !~ m/RC_PROJECTBUILDVERSION/) {
+ next;
+ }
+
+ chomp($line);
+
+ $line =~ m/RC_PROJECTSOURCEVERSION=([^\s]+) and RC_PROJECTBUILDVERSION=(.*)$/;
+
+ my $projectSourceResult=$1;
+ my $buildVersionResult=$2;
+
+ is($projectSourceResult, $testCase->{expectedVersionResult}, "$testCase->{'RC_ProjectSourceVersion'}: $testCase->{expectedVersionResult}");
+
+ my $testCaseInput = $testCase->{'RC_PROJECTBUILDVERSION'} || 'undefined';
+ is($buildVersionResult, $testCase->{expectedBuildVersionResult}, "$testCaseInput: $testCase->{expectedBuildVersionResult}");
+ }
+}
</ins></span></pre></div>
<a id="branchessafari6001branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (172488 => 172489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-12 20:43:37 UTC (rev 172488)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-12 20:46:18 UTC (rev 172489)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171903. <rdar://problem/17885078>
+
+ 2014-07-31 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use RC_PROJECTBUILDVERSION as build portion of version
+ https://bugs.webkit.org/show_bug.cgi?id=135478
+
+ Reviewed by David Kilzer.
+
+ * win/tools/scripts/version-stamp.pl: Check environment for
+ RC_PROJECTBUILDVERSION, and use it for the build portion of
+ the file version resource. Otherwise, use the __VERSION_BUILD__
+ value we calculated from the version string.
+
</ins><span class="cx"> 2014-08-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Turn off features we don't want to ship this cycle.
</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 (172488 => 172489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-12 20:43:37 UTC (rev 172488)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-12 20:46:18 UTC (rev 172489)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> use strict;
</span><span class="cx"> use File::Spec;
</span><ins>+use POSIX;
</ins><span class="cx">
</span><span class="cx"> # Copyright (C) 2007, 2009, 2014 Apple Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -90,17 +91,17 @@
</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><ins>+my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
</ins><span class="cx">
</span><del>-print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$components{'__VERSION_BUILD__'}\n";
</del><ins>+print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$SAFE_BUILD_VERSION\n";
</ins><span class="cx">
</span><span class="cx"> # Note: These environment settings only affect this script and its child processes:
</span><span class="cx"> $ENV{RC_PROJECTSOURCEVERSION} = $SAFE_PROJECT_VERSION;
</span><span class="cx"> $ENV{RC_ProjectSourceVersion} = $SAFE_PROJECT_VERSION;
</span><del>-$ENV{RC_PROJECTBUILDVERSION} = $components{'__VERSION_BUILD__'};
</del><span class="cx">
</span><span class="cx"> my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__VERSION_MAJOR__'},
</span><span class="cx"> '--fileMinor', $components{'__VERSION_MINOR__'}, '--fileRevision', $components{'__VERSION_TINY__'},
</span><del>- '--fileBuild', $components{'__VERSION_BUILD__'}, '--productMajor', $components{'__VERSION_MAJOR__'},
</del><ins>+ '--fileBuild', $SAFE_BUILD_VERSION, '--productMajor', $components{'__VERSION_MAJOR__'},
</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>