1427472 - Should --enable-official-branding really use branding/official for NIGHTLY_BUILDs?

Status: NEW

(Firefox Build System :: General, enhancement)

Description

[Mike Hommey [:glandium]]

A default build, without any specific branding option will get branding/unofficial. Which is kind of like nightly, but different.

Nightly builds get branding/nightly, and Release/beta get branding/official.

I'd argue --enable-official-branding, on non release/beta/esr branches should use the nightly branding.

Thoughts?

Comment 1

[Mike Kaply [:mkaply]]

I agree with this sentiment. We don't want anyone shipping Nightly with Firefox branding, so we should make it only possible to do deliberately by setting MOZ_OFFICIAL_BRANDING_DIRECTORY to browser/branding/official not accidentally with --enable-official-branding

Currently we switch between branding directories by just using a different variable in confvars.h

https://searchfox.org/mozilla-central/source/browser/confvars.sh#37

What's odd is we have this unnecessary check in old-configure.in:

https://searchfox.org/mozilla-central/source/old-configure.in#1398

if test -z "$MOZ_OFFICIAL_BRANDING_DIRECTORY"; then

But MOZ_OFFICIAL_BRANDING_DIRECTORY is always set by confvars.h

Comment 2

[Mike Hommey [:glandium]]

Well, that test comes from confvars.sh not necessarily coming from Firefox.

Comment 4

[Mike Hommey [:glandium]]

Q: should moz:official in search engine params return "official" on nightlies? (it currently doesn't and that seems odd) (OTOH, it seems to be only used for yahoo-jp-auctions, so the question might be, should we remove it?)

Comment 5

[Mike Kaply [:mkaply]]

We're checking on the official thing and hopefully we'll just remove.