1210611 - Globally define MOZILLA_OFFICIAL

Status: VERIFIED FIXED

(Firefox Build System :: General, defect)

Description

[Justin Dolske [:Dolske]]

*grumble* *grumble*

My fix for bug 1198525 didn't actually change anything. The contents of about:rights in Nightly and Aurora is still the unbranded flavor.

The cause is that despite MOZILLA_OFFICIAL being used in various places, it's only explicitly pulled out of the global config in _those_ places for use as a #define. This wasn't being done in toolkit/content/jar.mn, and so the #ifdef MOZILLA_OFFICIAL there never actually works. :(

This is kind of ridiculous, so I've changed it to be a global #define from autoconf, as opposed to being used piecemeal.

Comment 1

[Justin Dolske [:Dolske]]

Attachment: Patch v.1

I did a build with "export MOZILLA_OFFICIAL=1" in my mozconfig to confirm this actually fixes about:rights.

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8668709 [details] [diff] [review]
Patch v.1

Review of attachment 8668709 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/app/moz.build
@@ +28,5 @@
>  FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
>  
>  DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
>  
> +for var in ('LIBXUL_SDK'):

python can be confusing. This is equivalent to for var in 'LIBXUL_SDK', which will iterate over each letter in the string. The right format for a tuple with 1 element would be ('LIBXUL_SDK',).
But since there is only one left, you might as well remove the loop.

Comment 3

[Justin Dolske [:Dolske]]

Attachment: Patch v.2

Fixed broken loop.

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/3e53831ea3df

Comment 5

[Justin Dolske [:Dolske]]

Attachment: Patch for aurora

Fix trivial merge conflict for Aurora.

Approval Request Comment
[Feature/regressing bug #]: incomplete fix from bug 1198525
[User impact if declined]: incorrect text in about:rights
[Describe test coverage new/current, TreeHerder]: n/a
[Risks and why]: low, this makes official Nightly and Aurora builds have the same text that we ship on Beta and Release. (Developer builds will be unchanged.)
[String/UUID change made/needed]: n/a

Comment 6

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/3e53831ea3df

Comment 7

[Liz Henry (:lizzard) (relman/hg->git project)]

Comment on attachment 8669206 [details] [diff] [review]
Patch for aurora

Useful looking! Fixes about:rights, for now. Let's uplift to aurora.

Comment 8

[Justin Dolske [:Dolske]]

Current Nightly now has the expected text, so looks like this finally fixed it.

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/0cd19a713a9b