RESOLVED FIXED 135119
[Win] Correct auto-version.pl script for two-digit version numbers 
https://bugs.webkit.org/show_bug.cgi?id=135119
Summary [Win] Correct auto-version.pl script for two-digit version numbers
Brent Fulgham
Reported 2014-07-21 10:07:16 PDT
When I translated the "auto-version.sh" script into Perl, I misunderstood the pattern matching used for the __VERSION_MAJOR__ and __VERSION_MINOR__ components and assumed that version numbers must always be three (or more) digits. In fact, this script was meant to support two-digit versions as well. This patch corrects the regular expression to handle this case.
Attachments
Patch (1.76 KB, patch)
2014-07-21 10:11 PDT, Brent Fulgham 		no flags
DetailsFormatted DiffDiff
Patch (1.73 KB, patch)
2014-07-21 10:15 PDT, Brent Fulgham 		no flags
DetailsFormatted DiffDiff
Patch (1.47 KB, patch)
2014-07-21 10:16 PDT, Brent Fulgham 		no flags
DetailsFormatted DiffDiff
Patch (2.01 KB, patch)
2014-07-21 10:32 PDT, Brent Fulgham 		ddkilzer: review+
DetailsFormatted DiffDiff
Show Obsolete (3) View All Add attachment proposed patch, testcase, etc.
Brent Fulgham
Comment 1 2014-07-21 10:11:52 PDT
Created attachment 235224 [details] Patch
Brent Fulgham
Comment 2 2014-07-21 10:12:08 PDT
<rdar://problem/17743959>
Brent Fulgham
Comment 3 2014-07-21 10:14:08 PDT
Original Shell code: MAJOR_VERSION=${BUILD_MAJOR_VERSION:0:1} MINOR_VERSION=${BUILD_MAJOR_VERSION:1} Proposed Perl version: $BUILD_MAJOR_VERSION =~ m/^[^\d]*(\d)(\d{1,})/; my $MAJOR_VERSION = $1; my $MINOR_VERSION = $2;
Brent Fulgham
Comment 4 2014-07-21 10:15:29 PDT
Created attachment 235225 [details] Patch
Brent Fulgham
Comment 5 2014-07-21 10:16:27 PDT
Created attachment 235226 [details] Patch
Brent Fulgham
Comment 6 2014-07-21 10:32:34 PDT
Script behavior: 'auto-version.sh': RC_PROJECTSOURCEVERSION=15300 -> 300 -> 3, 00 RC_PROJECTSOURCEVERSION=5300 -> 300 -> 3, 00 RC_PROJECTSOURCEVERSION=530 -> 530 -> 5, 30 RC_PROJECTSOURCEVERSION=53 -> 53 -> 5, 3 RC_PROJECTSOURCEVERSION=5 -> 5 -> 5, ERROR 'auto-version.pl': RC_PROJECTSOURCEVERSION=15300 -> 300 -> 3, 00 RC_PROJECTSOURCEVERSION=5300 -> 300 -> 3, 00 RC_PROJECTSOURCEVERSION=530 -> 530 -> 5, 30 RC_PROJECTSOURCEVERSION=53 -> 53 -> 5, 3 RC_PROJECTSOURCEVERSION=5 -> 5 -> ERROR
Brent Fulgham
Comment 7 2014-07-21 10:32:57 PDT
Created attachment 235227 [details] Patch
David Kilzer (:ddkilzer)
Comment 8 2014-07-21 10:43:24 PDT
Comment on attachment 235227 [details] Patch r=me
Brent Fulgham
Comment 9 2014-07-21 10:44:47 PDT
Committed r171305: <http://trac.webkit.org/changeset/171305>
Note You need to log in before you can comment on or make changes to this bug.