swarming: Support branded mac builds.

swarming: Support branded mac builds.

BUG=324911
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238430

[Nico, 2013-12-03 02:15:30]

(click through, this now also removes some duplication)


On Mon, Dec 2, 2013 at 6:04 PM, <thakis@chromium.org> wrote:

> Reviewers: M-A Ruel,
>
> Description:
> swarming: Support branded mac builds.
>
> BUG=324911
>
> Please review this at https://codereview.chromium.org/99893005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+7, -3 lines):
>   M build/isolate.gypi
>   M chrome/chrome.isolate
>
>
> Index: build/isolate.gypi
> diff --git a/build/isolate.gypi b/build/isolate.gypi
> index 0f3c84a008666ab35ad8eb63b9f4736009ae71ff..
> 3c19d0b5c5cb3462054f3dec912181c26b720b5b 100644
> --- a/build/isolate.gypi
> +++ b/build/isolate.gypi
> @@ -78,6 +78,9 @@
>              '--outdir', '<(PRODUCT_DIR)/ ',
>              '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
>              '--variable', 'OS=<(OS)',
> +            # <(mac_product_name) can contain a space, so don't use
> FOO=<(FOO)
> +            # form.
> +            '--variable', 'mac_product_name', '<(mac_product_name)',
>              '--result', '<@(_outputs)',
>              '--isolate', '<(RULE_INPUT_PATH)',
>            ],
> @@ -90,6 +93,7 @@
>              # See comment above.
>              '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
>              '--variable', 'OS=<(OS)',
> +            '--variable', 'mac_product_name', '<(mac_product_name)',
>              '--result', '<@(_outputs)',
>              '--isolate', '<(RULE_INPUT_PATH)',
>            ],
> Index: chrome/chrome.isolate
> diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
> index 263a82c2e94a1197c86559caa79c472e10a823b3..
> 49831e7373774243fd7cb90ffcb7a60b14db949a 100644
> --- a/chrome/chrome.isolate
> +++ b/chrome/chrome.isolate
> @@ -39,11 +39,11 @@
>      ['OS=="mac"', {
>        'variables': {
>          'command': [
> -          '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
> +          '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(
> mac_product_name)',
>          ],
>          'isolate_dependency_untracked': [
> -          '<(PRODUCT_DIR)/Chromium Framework.framework/',
> -          '<(PRODUCT_DIR)/Chromium.app/',
> +          '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
> +          '<(PRODUCT_DIR)/<(mac_product_name).app/',
>          ],
>        },
>      }],
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[M-A Ruel, 2013-12-03 02:28:46]

It's a bit sad that this variable is really mac specific. I mean if it's generic
to Google Chrome/Chromium, I'd prefer to not use the mac_ prefix but I see that
it's really only used on mac. Anyhow this can be changed at a later time if
needed.

lgtm

[commit-bot: I haz the power, 2013-12-03 16:10:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/99893005/40001

[commit-bot: I haz the power, 2013-12-03 18:08:04]

Retried try job too often on mac_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[M-A Ruel, 2013-12-03 18:09:51]

On 2013/12/03 18:08:04, I haz the power (commit-bot) wrote:
> Retried try job too often on mac_rel for step(s) browser_tests
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

chrome-extension://mmpagghohindgfffjndjphhhiocnbpob/test.html sounds fishy.
Maybe a left over from a previous test case?

[Nico, 2013-12-03 18:13:06]

On 2013/12/03 18:09:51, M-A Ruel wrote:
> On 2013/12/03 18:08:04, I haz the power (commit-bot) wrote:
> > Retried try job too often on mac_rel for step(s) browser_tests
> >
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...
> 
> chrome-extension://mmpagghohindgfffjndjphhhiocnbpob/test.html sounds fishy.
> Maybe a left over from a previous test case?

Probably https://code.google.com/p/chromium/issues/detail?id=324915 :-(

[commit-bot: I haz the power, 2013-12-03 18:13:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/99893005/40001

[commit-bot: I haz the power, 2013-12-03 18:15:14]

Change committed as 238430