Title: [170954] trunk/WebKitLibraries
- Revision
- 170954
- Author
- bfulg...@apple.com
- Date
- 2014-07-09 22:32:40 -0700 (Wed, 09 Jul 2014)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/WebKitLibraries/ChangeLog (170953 => 170954)
--- trunk/WebKitLibraries/ChangeLog 2014-07-10 05:06:30 UTC (rev 170953)
+++ trunk/WebKitLibraries/ChangeLog 2014-07-10 05:32:40 UTC (rev 170954)
@@ -1,5 +1,14 @@
2014-07-09 Brent Fulgham <bfulg...@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 <bfulg...@apple.com>
+
[Win] Unreviewed gardening.
* win/tools/scripts/auto-version.pl: Protect against
Modified: trunk/WebKitLibraries/win/tools/scripts/auto-version.pl (170953 => 170954)
--- trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-10 05:06:30 UTC (rev 170953)
+++ trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-10 05:32:40 UTC (rev 170954)
@@ -76,6 +76,14 @@
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.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
