Closed Bug 462477 Opened 16 years ago Closed 6 years ago

Centralize -DOFFICIAL_BUILD and add to --enable-official-branding

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED INVALID

People

(Reporter: Dolske, Unassigned)

Details

Spun off from bug 456439:

A few places in the code want to used #ifdefs to change behavior in unbranded vs. branded builds. Instead of adding little changes to random Makefiles, we should define OFFICIAL_BUILD in one place, at the top level. It should also be enabled along with --enable-official-branding (currently you have to set an environment variable separately).
While we're at it, can we get rid of one of MOZILLA_OFFICIAL or BUILD_OFFICIAL? I've never been sure of the difference (if any).
I'm not sure how many things that is, but it's more than one.

M_O/B_O is bug 435923.

Most of the uses of -DOFFICIAL_BUILD look more like they want to have an AC_DEFINE(MOZILLA_OFFICIAL), rather than to have --enable-official-branding do AC_DEFINE(OFFICIAL_BRANDING), though it would take talking to people at Google to be absolutely sure. There are three right now:

your about:rights decisions, on whether or not to show (unclear whether that actually wants to be a branding choice) and what to show when it's showing (which is absolutely a branding choice)

whether to send rls=official or rls=unofficial in Google/Yahoo.jp search URLs - I suspect they're more interested in MOZILLA_OFFICIAL (==built by Mozilla, whether a nightly, alpha, beta, or release) than in --enable-official-branding (==a beta or release only)

whether to use "navclient-auto-ffox" or the appInfo.name as the client ID in safebrowsing requests - there again, I suspect they want to know about MOZILLA_OFFICIAL rather than branding, since if they really wanted branding they have plenty of programmers quite capable of having written a patch to give them that
Triaging, I think the work here has been done and this bug doesn't apply anymore.
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → INVALID
Component: Build Config → General
Product: Firefox → Firefox Build System
You need to log in before you can comment on or make changes to this bug.