Bug 132580

Summary:

[WIN] Enhance auto-version.sh to handle all-caps or mixed-case build environment variable

Product:

WebKit

Reporter:

Brent Fulgham <bfulgham>

Component:

Tools / Tests

Assignee:

Brent Fulgham <bfulgham>

Status:

RESOLVED FIXED

Severity:

Normal

Keywords:

InRadar

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

All

Bug Depends on:

132455

Bug Blocks:

Attachments:

Description	Flags
Patch	dino: review+

Description Brent Fulgham 2014-05-05 13:29:06 PDT

In Bug 132455, I modified our build scripts to support mixed-case environment variables. However, we should still support older build machines running old versions of Cygwin where these variables will be set to all caps.

This patch assumes we will be using the new mixed-case variable style. If that variable is not present, it falls back to the original use of all capitals.

Comment 1 Brent Fulgham 2014-05-05 13:31:02 PDT

Created attachment 230853 [details]
Patch

Comment 2 Brent Fulgham 2014-05-05 13:31:26 PDT

<rdar://problem/16811179>

Comment 3 Mark Rowe (bdash) 2014-05-05 14:41:48 PDT

Comment on attachment 230853 [details]
Patch

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

> WebKitLibraries/win/tools/scripts/auto-version.sh:53
>  ENVIRONMENT_VERSION="$RC_ProjectSourceVersion";
> +if [[ -z "$ENVIRONMENT_VERSION" ]]; then
> +    # Try the original all-caps version of the environment variable
> +    ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION";
> +fi

You can avoid the if by doing something like:
ENVIRONMENT_VERSION=${RC_ProjectSourceVersion:-$RC_PROJECTSOURCEVERSION};

Comment 4 Dean Jackson 2014-05-05 15:08:27 PDT

Comment on attachment 230853 [details]
Patch

Listen to Mark :)

Comment 5 Brent Fulgham 2014-05-05 15:12:29 PDT

Committed r168321: <http://trac.webkit.org/changeset/168321>