Bug 135478 – [Win] Use RC_PROJECTBUILDVERSION as build portion of version

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

[Brent Fulgham]

We want to make sure that the environment variable 'RC_PROJECTBUILDVERSION' is used (when available) to populate the FILE version of the version resource.

[Brent Fulgham]

Created attachment 235854 [details]
Patch

[Radar WebKit Bug Importer]

<rdar://problem/17877481>

[David Kilzer (:ddkilzer)]

Comment on attachment 235854 [details]
Patch

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

r=me either way

Also, can we write a test for SAFE_BUILD_VERSION being defined in the environment to test the override?

> WebKitLibraries/win/tools/scripts/version-stamp.pl:103
> +my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION};
> +if (!defined($SAFE_BUILD_VERSION)) {
> +    $SAFE_BUILD_VERSION = $components{'__VERSION_BUILD__'};
> +}

I would prefer to write this code thusly:

my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};

I think it's a lot easier to read that way.  :)

[Brent Fulgham]

Comment on attachment 235854 [details]
Patch

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

>> WebKitLibraries/win/tools/scripts/version-stamp.pl:103
>> +}
> 
> I would prefer to write this code thusly:
> 
> my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
> 
> I think it's a lot easier to read that way.  :)

Will do.

[Brent Fulgham]

Committed r171903: <http://trac.webkit.org/changeset/171903>