649198 - Switch to Aurora branding by default in the mozilla-aurora repository

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[LegNeato]

Switch to Aurora branding by default in the mozilla-aurora repository

Comment 1

[LegNeato]

Attachment: Default to the aurora branding in the aurora repo (mozilla-aurora only)

Comment 2

[(not currently active) Ted Mielczarek]

Is the intention that we'll land this on Aurora every time we pull from m-c? catlee was talking about this yesterday and was wondering if we could do this without that manual step. I suppose the tradeoff is between "land a patch on every m-c->m-a pull" and "have something in aurora mozconfigs to switch branding".

Comment 3

[LegNeato]

No, we'll likely use configs. Gavan and I discussed that this was the best way for this merge.

Comment 4

[LegNeato]

http://hg.mozilla.org/mozilla-aurora/rev/995ba458f7e0

Comment 5

[Mark Finkle (:mfinkle) (use needinfo?)]

I assume we could use --with-branding=/browser/branding/aurora  in the mozconfig

Comment 6

[:Gavin Sharp [email: [e-mail]]]

Yes, but I prefer the confvar.sh change, since it associates the branding change with the repository, rather than only our build slaves.

Comment 7

[Benjamin Smedberg]

Hrm, that's going to require manual intervention at each m-c->aurora merge, no? I really think this ought to be a property of the build config, not the code itself. But I guess we'll see how much pain this causes.

Comment 8

[:Gavin Sharp [email: [e-mail]]]

Yes. I'm hoping it's not a lot of pain (particularly compared to the other merging work that will be necessary).

Comment 9

[Chris AtLee [:catlee]]

We can set it in the mozconfig that's used for mozilla-aurora.