1182519 - Put mozconfigs and toolcool manifests for cross-mac builds in tree

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[(not currently active) Ted Mielczarek]

We need special mozconfigs for cross-mac builds because they need to configure the toolchain specially.

Comment 1

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1182519 - Put mozconfigs for cross-mac builds in tree. r?mshal

bug 1182519 - Put mozconfigs for cross-mac builds in tree. r?mshal

Comment 2

[(not currently active) Ted Mielczarek]

I stuck a platform conditional in the existing mozconfigs so we can reuse the same mozconfigs and just swap out the included mozconfig that sets toolchain paths. That seemed more sensible to me. Unfortunately it means we have an ugly conditional in the mozconfigs, but I think we already have that in our Windows mozconfigs as a leftover from supporting both win32/win64 build hosts.

Comment 3

[Michael Shal [:mshal]]

https://reviewboard.mozilla.org/r/13305/#review11965

::: browser/config/mozconfigs/macosx64/debug:4
(Diff revision 1)
> -. $topsrcdir/build/macosx/mozconfig.common
> +  . $topsrcdir/build/macosx/mozconfig.common

You can probably move this logic into build/macosx/mozconfig.common, and then move build/macosx/mozconfig.common to build/macosx/local-mozconfig.common or some such. Up to you though.

::: browser/config/tooltool-manifests/macosx64/cross-releng.manifest:10
(Diff revision 1)
> +"filename": "setup.sh"

Please remove the setup.sh file and just add '"unpack": true' attributes to the other packages so that they are automatically unpacked.

::: browser/config/tooltool-manifests/macosx64/cross-releng.manifest:4
(Diff revision 1)
> +}, 

Review board is highlighting lots of trailing spaces in this file. I guess it wants them removed :)

::: build/macosx/cross-mozconfig.common:35
(Diff revision 1)
> +#TODO: would be nice if these could automatically use TOOLCHAIN_PREFIX

Is this still a TODO? It looks like they do have TOOLCHAIN_PREFIX, but I don't know what you mean by "automatically".

Comment 4

[(not currently active) Ted Mielczarek]

https://reviewboard.mozilla.org/r/13305/#review11965

> You can probably move this logic into build/macosx/mozconfig.common, and then move build/macosx/mozconfig.common to build/macosx/local-mozconfig.common or some such. Up to you though.

That makes sense, will do.

> Review board is highlighting lots of trailing spaces in this file. I guess it wants them removed :)

Turns out that's how tooltool generates the manifests, because that's what Python's json module produces when you ask it to pretty-print. I'm just going to leave it.

> Is this still a TODO? It looks like they do have TOOLCHAIN_PREFIX, but I don't know what you mean by "automatically".

Yeah, I'll file a bug and put the bug number there. It'd be nice if TOOLCHAIN_PREFIX were set if configure could find ar/ranlib/strip/otool using TOOLCHAIN_PREFIX instead of having to explicitly specify them in the mozconfig.

Comment 5

[(not currently active) Ted Mielczarek]

Comment on attachment 8634042 [details]
MozReview Request: bug 1182519 - Put mozconfigs for cross-mac builds in tree. r?mshal

bug 1182519 - Put mozconfigs for cross-mac builds in tree. r?mshal

Comment 6

[Michael Shal [:mshal]]

Comment on attachment 8634042 [details]
MozReview Request: bug 1182519 - Put mozconfigs for cross-mac builds in tree. r?mshal

https://reviewboard.mozilla.org/r/13307/#review11979

Ship It!

Comment 7

[(not currently active) Ted Mielczarek]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=9c73f3f9cdc0

Comment 8

[(not currently active) Ted Mielczarek]

url:        https://hg.mozilla.org/integration/mozilla-inbound/rev/75ef39f03b968e3e952766c74b4db115f7283200
changeset:  75ef39f03b968e3e952766c74b4db115f7283200
user:       Ted Mielczarek <[e-mail]>
date:       Tue Jul 14 07:02:22 2015 -0400
description:
bug 1182519 - Put mozconfigs for cross-mac builds in tree. r=mshal

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/75ef39f03b96

Comment 10

[aleth [:aleth]]

url:        https://hg.mozilla.org/comm-central/rev/44eb39c39056edb821c9c20034ff5dad357e6082
changeset:  44eb39c39056edb821c9c20034ff5dad357e6082
user:       aleth <[e-mail]>
date:       Sat Aug 01 22:20:08 2015 +0200
description:
Port recent build/ changes from bug 1182519 and bug 1186748. rs=bustage-fix a=CLOSED TREE