<!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>[171825] tags/Safari-600.1.2.4</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/171825">171825</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-30 15:54:17 -0700 (Wed, 30 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171798">r171798</a>. <rdar://problem/17849033></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari600124SourceJavaScriptCoreChangeLog">tags/Safari-600.1.2.4/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari600124SourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePostBuildcmd">tags/Safari-600.1.2.4/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd</a></li>
<li><a href="#tagsSafari600124SourceWTFChangeLog">tags/Safari-600.1.2.4/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari600124SourceWTFWTFvcxprojWTFPostBuildcmd">tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd</a></li>
<li><a href="#tagsSafari600124SourceWTFWTFvcxprojWTFPreBuildcmd">tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd</a></li>
<li><a href="#tagsSafari600124SourceWebKitChangeLog">tags/Safari-600.1.2.4/Source/WebKit/ChangeLog</a></li>
<li><a href="#tagsSafari600124SourceWebKitWebKitvcxprojWebKitWebKitPostBuildcmd">tags/Safari-600.1.2.4/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd</a></li>
<li><a href="#tagsSafari600124ToolsChangeLog">tags/Safari-600.1.2.4/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari600124WebKitLibrariesChangeLog">tags/Safari-600.1.2.4/WebKitLibraries/ChangeLog</a></li>
<li><a href="#tagsSafari600124WebKitLibrarieswintoolsscriptsautoversionpl">tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/auto-version.pl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>tags/Safari-600.1.2.4/Tools/Scripts/webkitperl/auto-version_unittest/</li>
<li><a href="#tagsSafari600124ToolsScriptswebkitperlautoversion_unittestautoVersionTestspl">tags/Safari-600.1.2.4/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl</a></li>
<li><a href="#tagsSafari600124WebKitLibrarieswintoolsscriptsversionstamppl">tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/version-stamp.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari600124SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/JavaScriptCore/ChangeLog (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/JavaScriptCore/ChangeLog 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/JavaScriptCore/ChangeLog 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171798. <rdar://problem/17849033>
+
+ 2014-07-29 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Modify version numbering scheme to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135400
+ <rdar://problem/17849033>
+
+ Reviewed by David Kilzer.
+
+ * JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd: Use the
+ new version-stamp.pl script to version JavaScriptCore.dll.
+
</ins><span class="cx"> 2014-07-28 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171680. <rdar://problem/17830040>
</span></span></pre></div>
<a id="tagsSafari600124SourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePostBuildcmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
</del><ins>+perl "%WEBKIT_LIBRARIES%\tools\scripts\version-stamp.pl" "%INTDIR%" "%TARGETPATH%"
</ins><span class="cx"> if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="tagsSafari600124SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/WTF/ChangeLog (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/WTF/ChangeLog 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/WTF/ChangeLog 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171798. <rdar://problem/17849033>
+
+ 2014-07-29 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Modify version numbering scheme to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135400
+ <rdar://problem/17849033>
+
+ Reviewed by David Kilzer.
+
+ * WTF.vcxproj/WTFPostBuild.cmd: Use new version-stamp.pl script
+ to version WTF.dll.
+ * WTF.vcxproj/WTFPreBuild.cmd: Make sure we have created the
+ appropriate version resource during builds.
+
</ins><span class="cx"> 2014-07-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/17675068> Disable some features on this branch.
</span></span></pre></div>
<a id="tagsSafari600124SourceWTFWTFvcxprojWTFPostBuildcmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><del>-if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
</del><span class="cx">\ No newline at end of file
</span><ins>+perl "%WEBKIT_LIBRARIES%\tools\scripts\version-stamp.pl" "%INTDIR%" "%TARGETPATH%"
</ins></span></pre></div>
<a id="tagsSafari600124SourceWTFWTFvcxprojWTFPreBuildcmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -4,3 +4,5 @@
</span><span class="cx"> if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><ins>+
+perl "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.pl" "%INTDIR%"
</ins></span></pre></div>
<a id="tagsSafari600124SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/WebKit/ChangeLog (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/WebKit/ChangeLog 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/WebKit/ChangeLog 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171798. <rdar://problem/17849033>
+
+ 2014-07-29 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Modify version numbering scheme to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135400
+ <rdar://problem/17849033>
+
+ Reviewed by David Kilzer.
+
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Use the new
+ version-stamp.pl script to version JavaScriptCore.dll.
+
</ins><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Remove uses of 'bash' in build system
</span></span></pre></div>
<a id="tagsSafari600124SourceWebKitWebKitvcxprojWebKitWebKitPostBuildcmd"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -18,6 +18,6 @@
</span><span class="cx"> mkdir "%ResourcesDirectory%" 2>NUL
</span><span class="cx"> xcopy /y /d "%PROJECTDIR%\..\..\win\WebKit.resources\Info.plist" "%ResourcesDirectory%" >NUL
</span><span class="cx">
</span><del>-if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
</del><ins>+perl "%WEBKIT_LIBRARIES%\tools\scripts\version-stamp.pl" "%INTDIR%" "%TARGETPATH%"
</ins><span class="cx">
</span><span class="cx"> if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="tagsSafari600124ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/Tools/ChangeLog (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Tools/ChangeLog 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/Tools/ChangeLog 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171798. <rdar://problem/17849033>
+
+ 2014-07-29 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Modify version numbering scheme to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135400
+ <rdar://problem/17849033>
+
+ Reviewed by David Kilzer.
+
+ Update test cases to recognize that we can only support Major
+ values from 0-65535, Minor values from 0-64, Tiny values from 0-999,
+ Micro values from 0-64, and Nano values from 0-999.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: Update
+ test expectations for physical limits.
+
</ins><span class="cx"> 2014-07-24 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171487
</span></span></pre></div>
<a id="tagsSafari600124ToolsScriptswebkitperlautoversion_unittestautoVersionTestspl"></a>
<div class="addfile"><h4>Added: tags/Safari-600.1.2.4/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (0 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (rev 0)
+++ tags/Safari-600.1.2.4/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -0,0 +1,544 @@
</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',
+ 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' => '530.4.3.2.1',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.4.3.2.1',
+ '__BUILD_NUMBER__' => '530.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '530.4.3.2.1',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '53.4.3.2.1',
+ expectedResults => {
+ '__VERSION_TEXT__' => '53.4.3.2.1',
+ '__BUILD_NUMBER__' => '53.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '53.4.3.2.1',
+ '__VERSION_MAJOR__' => '53',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '53',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5.4.3.2.1',
+ expectedResults => {
+ '__VERSION_TEXT__' => '5.4.3.2.1',
+ '__BUILD_NUMBER__' => '5.4.3.2.1',
+ '__BUILD_NUMBER_SHORT__' => '5.4.3.2.1',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2001',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '5',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2001',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3.2',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3.2',
+ '__BUILD_NUMBER__' => '300.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3.2',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2000',
+ '__VERSION_BUILD__' => '2',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '530.4.3.2',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.4.3.2',
+ '__BUILD_NUMBER__' => '530.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '530.4.3.2',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2000',
+ '__VERSION_BUILD__' => '2',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '53.4.3.2',
+ expectedResults => {
+ '__VERSION_TEXT__' => '53.4.3.2',
+ '__BUILD_NUMBER__' => '53.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '53.4.3.2',
+ '__VERSION_MAJOR__' => '53',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2000',
+ '__VERSION_BUILD__' => '2',
+ '__BUILD_NUMBER_MAJOR__' => '53',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5.4.3.2',
+ expectedResults => {
+ '__VERSION_TEXT__' => '5.4.3.2',
+ '__BUILD_NUMBER__' => '5.4.3.2',
+ '__BUILD_NUMBER_SHORT__' => '5.4.3.2',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '2000',
+ '__VERSION_BUILD__' => '2',
+ '__BUILD_NUMBER_MAJOR__' => '5',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '2000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4.3',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4.3',
+ '__BUILD_NUMBER__' => '300.4.3',
+ '__BUILD_NUMBER_SHORT__' => '300.4.3',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '530.4.3',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.4.3',
+ '__BUILD_NUMBER__' => '530.4.3',
+ '__BUILD_NUMBER_SHORT__' => '530.4.3',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '53.4.3',
+ expectedResults => {
+ '__VERSION_TEXT__' => '53.4.3',
+ '__BUILD_NUMBER__' => '53.4.3',
+ '__BUILD_NUMBER_SHORT__' => '53.4.3',
+ '__VERSION_MAJOR__' => '53',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '53',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5.4.3',
+ expectedResults => {
+ '__VERSION_TEXT__' => '5.4.3',
+ '__BUILD_NUMBER__' => '5.4.3',
+ '__BUILD_NUMBER_SHORT__' => '5.4.3',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '4003',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '5',
+ '__BUILD_NUMBER_MINOR__' => '4003',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300.4',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300.4',
+ '__BUILD_NUMBER__' => '300.4',
+ '__BUILD_NUMBER_SHORT__' => '300.4',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '4000',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '4000',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '530.4',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.4',
+ '__BUILD_NUMBER__' => '530.4',
+ '__BUILD_NUMBER_SHORT__' => '530.4',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '4000',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '4000',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '53.4',
+ expectedResults => {
+ '__VERSION_TEXT__' => '53.4',
+ '__BUILD_NUMBER__' => '53.4',
+ '__BUILD_NUMBER_SHORT__' => '53.4',
+ '__VERSION_MAJOR__' => '53',
+ '__VERSION_MINOR__' => '4000',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '53',
+ '__BUILD_NUMBER_MINOR__' => '4000',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5.4',
+ expectedResults => {
+ '__VERSION_TEXT__' => '5.4',
+ '__BUILD_NUMBER__' => '5.4',
+ '__BUILD_NUMBER_SHORT__' => '5.4',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '4000',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '5',
+ '__BUILD_NUMBER_MINOR__' => '4000',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '5300',
+ expectedResults => {
+ '__VERSION_TEXT__' => '300',
+ '__BUILD_NUMBER__' => '300',
+ '__BUILD_NUMBER_SHORT__' => '300',
+ '__VERSION_MAJOR__' => '300',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '300',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '530',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530',
+ '__BUILD_NUMBER__' => '530',
+ '__BUILD_NUMBER_SHORT__' => '530',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ {
+ '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__' => '530',
+ '__VERSION_MINOR__' => '1001',
+ '__VERSION_TINY__' => '1000',
+ '__VERSION_BUILD__' => '1',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '1001',
+ '__BUILD_NUMBER_VARIANT__' => '1000',
+ },
+ },
+
+ {
+ '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__' => '530',
+ '__VERSION_MINOR__' => '30020',
+ '__VERSION_TINY__' => '10000',
+ '__VERSION_BUILD__' => '10',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '30020',
+ '__BUILD_NUMBER_VARIANT__' => '10000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '10530.64.200.64',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.64.200.64',
+ '__BUILD_NUMBER__' => '530.64.200.64',
+ '__BUILD_NUMBER_SHORT__' => '530.64.200.64',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '64200',
+ '__VERSION_TINY__' => '64000',
+ '__VERSION_BUILD__' => '64',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '64200',
+ '__BUILD_NUMBER_VARIANT__' => '64000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '10530.64.999.64',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.64.999.64',
+ '__BUILD_NUMBER__' => '530.64.999.64',
+ '__BUILD_NUMBER_SHORT__' => '530.64.999.64',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '64999',
+ '__VERSION_TINY__' => '64000',
+ '__VERSION_BUILD__' => '64',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '64999',
+ '__BUILD_NUMBER_VARIANT__' => '64000',
+ },
+ },
+
+ {
+ 'RC_ProjectSourceVersion' => '7530.64.99.10',
+ expectedResults => {
+ '__VERSION_TEXT__' => '530.64.99.10',
+ '__BUILD_NUMBER__' => '530.64.99.10',
+ '__BUILD_NUMBER_SHORT__' => '530.64.99.10',
+ '__VERSION_MAJOR__' => '530',
+ '__VERSION_MINOR__' => '64099',
+ '__VERSION_TINY__' => '10000',
+ '__VERSION_BUILD__' => '10',
+ '__BUILD_NUMBER_MAJOR__' => '530',
+ '__BUILD_NUMBER_MINOR__' => '64099',
+ '__BUILD_NUMBER_VARIANT__' => '10000',
+ },
+ },
+
+ # Smallest "Valid" case
+ {
+ 'RC_ProjectSourceVersion' => '53',
+ expectedResults => {
+ '__VERSION_TEXT__' => '53',
+ '__BUILD_NUMBER__' => '53',
+ '__BUILD_NUMBER_SHORT__' => '53',
+ '__VERSION_MAJOR__' => '53',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '53',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ # We don't support 1-digit versions, but we should run without crashing
+ {
+ 'RC_ProjectSourceVersion' => '5',
+ expectedResults => {
+ '__VERSION_TEXT__' => '5',
+ '__BUILD_NUMBER__' => '5',
+ '__BUILD_NUMBER_SHORT__' => '5',
+ '__VERSION_MAJOR__' => '5',
+ '__VERSION_MINOR__' => '0',
+ '__VERSION_TINY__' => '0',
+ '__VERSION_BUILD__' => '0',
+ '__BUILD_NUMBER_MAJOR__' => '5',
+ '__BUILD_NUMBER_MINOR__' => '0',
+ '__BUILD_NUMBER_VARIANT__' => '0',
+ },
+ },
+
+ # Largest specified version test
+ {
+ 'RC_ProjectSourceVersion' => '214747.64.999.64.999',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.64.999.64.999',
+ '__BUILD_NUMBER__' => '747.64.999.64.999',
+ '__BUILD_NUMBER_SHORT__' => '747.64.999.64.999',
+ '__VERSION_MAJOR__' => '747',
+ '__VERSION_MINOR__' => '64999',
+ '__VERSION_TINY__' => '64999',
+ '__VERSION_BUILD__' => '999',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '64999',
+ '__BUILD_NUMBER_VARIANT__' => '64999',
+ },
+ },
+
+ # Leading Whitespace
+ {
+ 'RC_ProjectSourceVersion' => ' 214747.64.99.64.99',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.64.99.64.99',
+ '__BUILD_NUMBER__' => '747.64.99.64.99',
+ '__BUILD_NUMBER_SHORT__' => '747.64.99.64.99',
+ '__VERSION_MAJOR__' => '747',
+ '__VERSION_MINOR__' => '64099',
+ '__VERSION_TINY__' => '64099',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '64099',
+ '__BUILD_NUMBER_VARIANT__' => '64099',
+ },
+ },
+
+ # Trailing Whitespace
+ {
+ 'RC_ProjectSourceVersion' => '214747.64.99.64.99 ',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.64.99.64.99',
+ '__BUILD_NUMBER__' => '747.64.99.64.99',
+ '__BUILD_NUMBER_SHORT__' => '747.64.99.64.99',
+ '__VERSION_MAJOR__' => '747',
+ '__VERSION_MINOR__' => '64099',
+ '__VERSION_TINY__' => '64099',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '64099',
+ '__BUILD_NUMBER_VARIANT__' => '64099',
+ },
+ },
+
+ # Leading and Trailing Whitespace
+ {
+ 'RC_ProjectSourceVersion' => ' 214747.64.99.64.99 ',
+ expectedResults => {
+ '__VERSION_TEXT__' => '747.64.99.64.99',
+ '__BUILD_NUMBER__' => '747.64.99.64.99',
+ '__BUILD_NUMBER_SHORT__' => '747.64.99.64.99',
+ '__VERSION_MAJOR__' => '747',
+ '__VERSION_MINOR__' => '64099',
+ '__VERSION_TINY__' => '64099',
+ '__VERSION_BUILD__' => '99',
+ '__BUILD_NUMBER_MAJOR__' => '747',
+ '__BUILD_NUMBER_MINOR__' => '64099',
+ '__BUILD_NUMBER_VARIANT__' => '64099',
+ },
+ },
+);
+
+# 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) * 10; # 10 expected results
+plan(tests => $testCasesCount);
+
+foreach my $testCase (@testCases) {
+ my $toolsPath = $ENV{'WEBKIT_LIBRARIES'};
+ my $autoVersionScript = File::Spec->catfile($toolsPath, 'tools', 'scripts', 'auto-version.pl');
+ my $testOutputDir = tempdir(CLEANUP => 1);
+ `RC_ProjectSourceVersion="$testCase->{'RC_ProjectSourceVersion'}" perl $autoVersionScript $testOutputDir`;
+
+ my $expectedResults = $testCase->{expectedResults};
+
+ my $outputFile = File::Spec->catfile($testOutputDir, 'include', 'autoversion.h');
+ open(TEST_OUTPUT, '<', $outputFile) or die "Unable to open $outputFile: $!";
+
+ while (my $line = <TEST_OUTPUT>) {
+ foreach my $expectedResultKey (keys %$expectedResults) {
+ if ($line !~ m/$expectedResultKey/) {
+ next;
+ }
+
+ $line =~ s/#define $expectedResultKey//;
+ $line =~ s/^\s*(.*)\s*$/$1/;
+ $line =~ s/^"(.*)"$/$1/;
+ chomp($line);
+
+ my $expectedResultValue = $expectedResults->{$expectedResultKey};
+ is($line, $expectedResultValue, "$testCase->{'RC_ProjectSourceVersion'}: $expectedResultKey");
+ }
+ }
+
+ close(TEST_OUTPUT);
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="tagsSafari600124WebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/WebKitLibraries/ChangeLog (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/WebKitLibraries/ChangeLog 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/WebKitLibraries/ChangeLog 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171798. <rdar://problem/17849033>
+
+ 2014-07-29 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Modify version numbering scheme to support 5-tuple versions
+ https://bugs.webkit.org/show_bug.cgi?id=135400
+ <rdar://problem/17849033>
+
+ Reviewed by David Kilzer.
+
+ Revise the auto-version.pl script so that it generates a set of packed
+ version tuples that allow us to map 5-tuple versions into something
+ that will work with Windows' 3-tuple version structure.
+
+ * win/tools/scripts/auto-version.pl:
+ (packTwoValues): Added,
+ (splitVersion): Revised to return packed combination of minor-tiny and
+ micro-nano to be used as "MINOR" and "TINY" portion of version.
+ (splitBuildMajorVersion): Deleted.
+ * win/tools/scripts/version-stamp.pl: Added.
+
</ins><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171305.
</span></span></pre></div>
<a id="tagsSafari600124WebKitLibrarieswintoolsscriptsautoversionpl"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/auto-version.pl (171824 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-30 22:26:22 UTC (rev 171824)
+++ tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -28,6 +28,8 @@
</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($);
+
</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,48 +70,10 @@
</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, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_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;
-}
-
-$PROPOSED_VERSION = "$BUILD_MAJOR_VERSION.$BUILD_MINOR_VERSION.$BUILD_TINY_VERSION";
-
-# 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;
-my $TINY_VERSION = $BUILD_MINOR_VERSION;
-my $VARIANT_VERSION = $BUILD_TINY_VERSION;
-
-my $VERSION_TEXT = $PROPOSED_VERSION;
</del><ins>+my $TINY_VERSION = $BUILD_TINY_VERSION;
+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">@@ -135,10 +99,10 @@
</span><span class="cx"> #define __VERSION_TEXT__ "$VERSION_TEXT"
</span><span class="cx"> #define __BUILD_NUMBER__ "$VERSION_TEXT"
</span><span class="cx"> #define __BUILD_NUMBER_SHORT__ "$VERSION_TEXT_SHORT"
</span><del>-#define __VERSION_MAJOR__ $MAJOR_VERSION
-#define __VERSION_MINOR__ $MINOR_VERSION
-#define __VERSION_TINY__ $TINY_VERSION
-#define __VERSION_BUILD__ $VARIANT_VERSION
</del><ins>+#define __VERSION_MAJOR__ $BUILD_MAJOR_VERSION
+#define __VERSION_MINOR__ $BUILD_MINOR_VERSION
+#define __VERSION_TINY__ $BUILD_TINY_VERSION
+#define __VERSION_BUILD__ $BUILD_VARIANT_VERSION
</ins><span class="cx"> #define __BUILD_NUMBER_MAJOR__ $BUILD_MAJOR_VERSION
</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="lines">@@ -149,3 +113,61 @@
</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 packTwoValues($$)
+{
+ my $first = shift;
+ my $second = shift;
+
+ die "First version component ($first) is too large. Must be between 0 and 99" if ($first > 99);
+ die "Second version component ($second) is too large. Must be between 0 and 999" if ($second > 999);
+
+ return $first * 1000 + $second;
+}
+
+sub splitVersion($)
+{
+ my $PROPOSED_VERSION = shift;
+
+ $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.
+ 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;
+ my $BUILD_MICRO_VERSION = 0;
+ my $BUILD_NANO_VERSION = 0;
+ if ($componentCount > 1) {
+ $BUILD_MINOR_VERSION = $components[1];
+ }
+ if ($componentCount > 2) {
+ $BUILD_TINY_VERSION = $components[2];
+ }
+ if ($componentCount > 3) {
+ $BUILD_MICRO_VERSION = $components[3];
+ }
+
+ my $RETURN_NANO_VERSION = $BUILD_MICRO_VERSION;
+ if ($componentCount > 4) {
+ $BUILD_NANO_VERSION = $components[4];
+ $RETURN_NANO_VERSION = $BUILD_NANO_VERSION;
+ }
+
+ # 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.
+ my $originalLength = length($BUILD_MAJOR_VERSION);
+ $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
+
+ my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
+
+ $PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
+
+ return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION);
+}
</ins></span></pre></div>
<a id="tagsSafari600124WebKitLibrarieswintoolsscriptsversionstampplfromrev171798trunkWebKitLibrarieswintoolsscriptsversionstamppl"></a>
<div class="copfile"><h4>Copied: tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/version-stamp.pl (from rev 171798, trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl) (0 => 171825)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/version-stamp.pl (rev 0)
+++ tags/Safari-600.1.2.4/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-07-30 22:54:17 UTC (rev 171825)
</span><span class="lines">@@ -0,0 +1,113 @@
</span><ins>+#!/usr/bin/perl -w
+
+use strict;
+use File::Spec;
+
+# Copyright (C) 2007, 2009, 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. ``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
+# 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.
+
+sub exitStatus($);
+
+my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
+
+my $VERSION_STAMPER = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'VersionStamper', 'VersionStamper.exe');
+
+unless (-e $VERSION_STAMPER) {
+ print "No $VERSION_STAMPER executable. Exiting.\n";
+ exit(0);
+}
+
+my ($intdir, $target);
+if (scalar(@ARGV) > 1) {
+ $intdir = $ARGV[0];
+ $target = $ARGV[1];
+} else {
+ my @arguments = split(/\s+/, $ARGV[0]) or die "Couldn't parse $ARGV[0]";
+ die "You must supply the build output directory and the target to be stamped with version information.\n" if (scalar(@arguments) < 2);
+ $intdir = $arguments[0];
+ $target = $arguments[1];
+}
+
+# Make sure we don't have any leading or trailing quote characters.
+$intdir =~ s/^\"//;
+$intdir =~ s/\"$//;
+
+$target =~ s/^\"//;
+$target =~ s/\"$//;
+
+my %components =
+(
+ '__VERSION_TEXT__' => undef,
+ '__VERSION_MAJOR__' => undef,
+ '__VERSION_MINOR__' => undef,
+ '__VERSION_TINY__' => undef,
+ '__VERSION_BUILD__' => undef,
+);
+
+my $VERSION_FILE = File::Spec->catfile(File::Spec->canonpath($intdir), 'include', 'autoversion.h');
+
+open(VERSION_INFO, '<', $VERSION_FILE) or die "Unable to open $VERSION_FILE: $!\n";
+while (my $line = <VERSION_INFO>) {
+ foreach my $componentKey (keys %components) {
+ if ($line !~ m/$componentKey/) {
+ next;
+ }
+
+ $line =~ s/#define $componentKey//;
+ $line =~ s/^\s*(.*)\s*$/$1/;
+ $line =~ s/^"(.*)"$/$1/;
+ chomp($line);
+
+ $components{$componentKey} = $line;
+ }
+}
+close(VERSION_INFO);
+
+print "Processing version $components{'__VERSION_TEXT__'} for $target\n";
+
+my $TARGET_PATH = File::Spec->canonpath($target);
+
+my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__VERSION_MAJOR__'},
+ '--fileMinor', $components{'__VERSION_MINOR__'}, '--fileRevision', $components{'__VERSION_TINY__'},
+ '--fileBuild', $components{'__VERSION_BUILD__'}, '--productMajor', $components{'__VERSION_MAJOR__'},
+ '--productMinor', $components{'__VERSION_MINOR__'}, '--productRevision', $components{'__VERSION_TINY__'},
+ '--productBuild', $components{'__VERSION_BUILD__'});
+
+exit(exitStatus($rc));
+
+# This method is for portability. Return the system-appropriate exit
+# status of a child process.
+#
+# Args: pass the child error status returned by the last pipe close,
+# for example "$?".
+sub exitStatus($)
+{
+ my ($returnvalue) = @_;
+ if ($^O eq "MSWin32") {
+ return $returnvalue >> 8;
+ }
+ if (!WIFEXITED($returnvalue)) {
+ return 254;
+ }
+ return WEXITSTATUS($returnvalue);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>