Title: [171327] tags/Safari-600.1.1.1/WebKitLibraries
- Revision
- 171327
- Author
- [email protected]
- Date
- 2014-07-21 17:56:21 -0700 (Mon, 21 Jul 2014)
Log Message
Merged r171305. <rdar://problem/17743959>
Modified Paths
Diff
Modified: tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog (171326 => 171327)
--- tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog 2014-07-22 00:38:38 UTC (rev 171326)
+++ tags/Safari-600.1.1.1/WebKitLibraries/ChangeLog 2014-07-22 00:56:21 UTC (rev 171327)
@@ -1,3 +1,23 @@
+2014-07-21 Babak Shafiei <[email protected]>
+
+ Merge r171305.
+
+ 2014-07-21 Brent Fulgham <[email protected]>
+
+ [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-10 Alex Christensen <[email protected]>
Enable same features on all Windows ports.
Modified: tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl (171326 => 171327)
--- tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 00:38:38 UTC (rev 171326)
+++ tags/Safari-600.1.1.1/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-22 00:56:21 UTC (rev 171327)
@@ -87,7 +87,7 @@
# 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 @@
# 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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
