Bug 135948 - [Win] Extend auto-version.pl and version-stamp.pl to account for RC_ProjectBuildVersion
Summary: [Win] Extend auto-version.pl and version-stamp.pl to account for RC_ProjectBu...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC All
: P2 Normal
Assignee: Brent Fulgham
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2014-08-14 12:34 PDT by Brent Fulgham
Modified: 2014-08-14 14:09 PDT (History)
2 users (show)

See Also:

Attachments
Patch (3.57 KB, patch)
2014-08-14 12:46 PDT, Brent Fulgham 		ddkilzer: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Brent Fulgham 2014-08-14 12:34:27 PDT 
Update these two build utilities to handle the RC_ProjectBuildVersion environment variable, and to recognize both possible capitalization styles.
Comment 1 Radar WebKit Bug Importer 2014-08-14 12:34:56 PDT 
<rdar://problem/18022221>
Comment 2 Brent Fulgham 2014-08-14 12:46:48 PDT 
Created attachment 236609 [details]
Patch
Comment 3 David Kilzer (:ddkilzer) 2014-08-14 13:03:15 PDT 
Comment on attachment 236609 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=236609&action=review

r=me, but please add tests for the override behavior.

> WebKitLibraries/win/tools/scripts/auto-version.pl:152
> +    my $RETURN_NANO_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $BUILD_MICRO_VERSION;

Nit:  Should be consistent here and use '' quotes around the hash key like the code above.
Comment 4 Brent Fulgham 2014-08-14 14:02:57 PDT 
(In reply to comment #3)
> (From update of attachment 236609 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=236609&action=review
> 
> r=me, but please add tests for the override behavior.

Done! I actually had them, but did my `webkit-patch upload` from the WebKitLibraries directory.

> > WebKitLibraries/win/tools/scripts/auto-version.pl:152
> > +    my $RETURN_NANO_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $BUILD_MICRO_VERSION;
> 
> Nit:  Should be consistent here and use '' quotes around the hash key like the code above.

Will do!
Comment 5 Brent Fulgham 2014-08-14 14:09:39 PDT 
Committed r172604: <http://trac.webkit.org/changeset/172604>