Bug 135948 – [Win] Extend auto-version.pl and version-stamp.pl to account for RC_ProjectBuildVersion

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Brent Fulgham]

Update these two build utilities to handle the RC_ProjectBuildVersion environment variable, and to recognize both possible capitalization styles.

[Radar WebKit Bug Importer]

<rdar://problem/18022221>

[Brent Fulgham]

Created attachment 236609 [details]
Patch

[David Kilzer (:ddkilzer)]

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.

[Brent Fulgham]

(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!

[Brent Fulgham]

Committed r172604: <http://trac.webkit.org/changeset/172604>