[Win] Unreviewed build fix.

Build bots don't have a three-part default version string,
breaking pattern matching. Handle this case.

* win/tools/scripts/auto-version.pl:

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 83bf6744b7f778294d13ffc8ad73b4b732209943..75638f2f16ace15277c917a6333cfe1694c4a4cb 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-09  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Unreviewed build fix.
+
+        Build bots don't have a three-part default version string,
+        breaking pattern matching. Handle this case.
+
+        * win/tools/scripts/auto-version.pl:
+
 2014-07-09  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed gardening.

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
index 2c7f000f9dea341154409e04e3cbd4c3f62692a4..c6d26bf9adeacba163f4cde588c670a403590dcc 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
@@ -76,6 +76,14 @@ my $BUILD_MAJOR_VERSION = $1;
 my $BUILD_MINOR_VERSION = $2;
 my $BUILD_TINY_VERSION = $3;
 
+# 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.