[Win] Correct auto-version.pl script for two-digit version numbers

https://bugs.webkit.org/show_bug.cgi?id=135119
<rdar://problem/17743959>

Reviewed by David Kilzer.

The $MAJOR_VERSION must be the first digit of $BUILD_MAJOR_VERSION,
and $MINOR_VERSION must be the remaining digits.

Also correct regexp (line 90) that was allowing version numbers
larger than three digits to be processed.

* win/tools/scripts/auto-version.pl: Correct regular expression.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 2dc8a5c1f965acd9903757ff74a395d4f3f0b267..9fbd2bbad2a87ebf2aa696f7432f726c671e373f 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,19 @@
+2014-07-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Correct auto-version.pl script for two-digit version numbers
+        https://bugs.webkit.org/show_bug.cgi?id=135119
+        <rdar://problem/17743959>
+
+        Reviewed by David Kilzer.
+
+        The $MAJOR_VERSION must be the first digit of $BUILD_MAJOR_VERSION,
+        and $MINOR_VERSION must be the remaining digits.
+
+        Also correct regexp (line 90) that was allowing version numbers
+        larger than three digits to be processed.
+
+        * win/tools/scripts/auto-version.pl: Correct regular expression.
+
 2014-07-18  Dana Burkart  <dburkart@apple.com>
 
         Add a new 'analyze' target to the makefile. This will make use of a new

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
index c6d26bf9adeacba163f4cde588c670a403590dcc..f5e7876a078352bad9cd5cf99c0ccb0b489d83d1 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
@@ -87,7 +87,7 @@ if (!defined $BUILD_MAJOR_VERSION && !defined $BUILD_MINOR_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.
-$BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d+)$/$1/;
+$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) {
@@ -103,7 +103,7 @@ $PROPOSED_VERSION = "$BUILD_MAJOR_VERSION.$BUILD_MINOR_VERSION.$BUILD_TINY_VERSI
 # 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)/;
+$BUILD_MAJOR_VERSION =~ m/^[^\d]*(\d)(\d{1,})/;
 my $MAJOR_VERSION = $1;
 my $MINOR_VERSION = $2;
 my $TINY_VERSION = $BUILD_MINOR_VERSION;