*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.
I did a build with "export MOZILLA_OFFICIAL=1" in my mozconfig to confirm this actually fixes about:rights.
Assignee: nobody → dolske
Attachment #8668709 - Flags: review?(mh+mozilla)
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.
Attachment #8668709 - Flags: review?(mh+mozilla) → review+
Fixed broken loop.
Attachment #8668709 - Attachment is obsolete: true
Attachment #8669184 - Attachment is patch: true
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
Attachment #8669206 - Flags: approval-mozilla-aurora?
Comment on attachment 8669206 [details] [diff] [review] Patch for aurora Useful looking! Fixes about:rights, for now. Let's uplift to aurora.
Attachment #8669206 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
Current Nightly now has the expected text, so looks like this finally fixed it.
Status: RESOLVED → VERIFIED
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.