307299 - Remove vestiges of MOZ_USE_OFFICIAL_BRANDING

Status: RESOLVED WORKSFORME

(Firefox Build System :: General, defect)

Description

[Mark Mentovai]

Bug 269460 got rid of most of MOZ_USE_OFFICIAL_BRANDING, to the point that it's
no longer defined when --enable-official-branding is set.  However, some parts
of the build system still look for it:

http://lxr.mozilla.org/mozilla/search?string=MOZ_USE_OFFICIAL_BRANDING

I just got rid of one of these in bug 306020 because it was causing
officially-branded Mac Firefox to not build.  The rest of the instances should
be cleaned up as well.

Comment 1

[Mark Mentovai]

Attachment: Remove from configure.in

Another change was needed in bug 306020, this time, to configure.in. 
Attachment 195102 [details] [diff] was checked in on the branch only.  MOZ_USE_OFFICIAL_BRANDING
is still used in configure.in for a very important purpose: setting
MOZ_APP_DISPLAYNAME.  When building browser, MOZ_APP_DISPLAYNAME will ALWAYS be
set to DeerPark, unless care is taken to set MOZ_USE_OFFICIAL_BRANDING in the
environment.

http://lxr.mozilla.org/mozilla1.8/source/configure.in#4218

This totally caused bustage on the Mac, which uses MOZ_APP_DISPLAYNAME to
figure out what to name the app bundle.  Having MOZ_APP_DISPLAYNAME set to
DeerPark in officially branded builds is even undesirable when it doesn't bust
the build.

The fix (attachment 195102 [details] [diff] [review], not this attachment) was checked in on the branch
only, because it's a critical time for the branch.  MOZ_USE_OFFICIAL_BRANDING
isn't a long term solution here (in fact, this bug is intended to kill the rest
of it).  Perhaps it would be more workable, going forward, to set
MOZ_APP_DISPLAYNAME to GeckoBrowser as the default for browser, and then set
the name to Firefox as a special case in the --enable-official-branding block. 
That's what the attached patch does, except it continues to use DeerPark
instead of GeckoBrowser for the time being.

Comment 2

[Mark Mentovai]

Comment on attachment 195104 [details] [diff] [review]
Remove from configure.in

Checked in on the trunk.  We should take this on the branch too, replacing the
temporary job from attachment 195102 [details] [diff] [review].  Leaving open for more
MOZ_USE_OFFICIAL_BRANDING removal.

Comment 3

[Mark Mentovai]

fixed1.8 only applies to the portion for configure.in.  Other uses of
MOZ_USE_OFFICIAL_BRANDING remain and need to be removed, although they may not
be critical on the branch.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

MOZ_USE_OFFICIAL_BRANDING no longer exists anywhere on the 1.8 branch or the trunk. Sunbird still references it on the 1.8.0 branch, but that's unsupported at this point.

--> WORKSFORME