684782 - Readd support for the explicit $topsrcdir/mozconfig location (but error if mozconfig and .mozconfig are both present)

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jeff Walden [:Waldo]]

Attachment: Patch

Bug 675691 removed support for a slew of bizarre locations implicitly probed for a mozconfig for sourcing Mozilla build options.  That's good: explicit is better than implicit, and all that.

Yet I think this removal went slightly too far in removing support for $topsrcdir/mozconfig.  This useful alternative to .mozconfig was good precisely because it is explicit: it shows up in directory listings, and in folder views and the like, where .mozconfig does not.

I understand there have been "multiple requests to add [$topsrcdir/mozconfig support] back".  Reading bug 675691, the reason I see for not doing this is worry about having "a fair bit of additional complexity" from allowing two different locations and it not being clear which would be used.  I'm happy to take on that complexity (which seems to be only a few lines) if that's what it takes to preserve the explicit, visible-in-directories non-dotted mozconfig name.

So could we readd support for $topsrcdir/mozconfig, please?

Comment 1

[Rain [:rain1] (inactive)]

Yeah, this makes sense.

Comment 2

[Justin Wood (:Callek)]

Comment on attachment 558371 [details] [diff] [review]
Patch

Jeff, [or sid] when this lands on m-c can you possibly land an exact copy of this patch to c-c?

Comment 3

[Mounir Lamouri (:mounir)]

Just pushed to inbound. Will try to push to comm-central when it will be green on inbound. Otherwise, would be great that the merger does it.

Comment 4

[(no longer active)]

http://hg.mozilla.org/mozilla-central/rev/c7e4e6e380ba

Comment 5

[Mark Banner (:standard8)]

Checked into c-c: http://hg.mozilla.org/comm-central/rev/f3dea0d0f794