Closed
Bug 397621
Opened 17 years ago
Closed 17 years ago
Thunderbird Nightlies/RCs/Beta builds should have different branding to full releases like Firefox
Categories
(Thunderbird :: Build Config, defect, P1)
Thunderbird
Build Config
Tracking
(Not tracked)
VERIFIED
FIXED
Thunderbird 3
People
(Reporter: noel.markham, Assigned: standard8)
References
Details
Attachments
(5 files)
7.34 KB,
patch
|
davida
:
review+
Bienvenu
:
review+
|
Details | Diff | Splinter Review |
2.18 KB,
patch
|
rhelmer
:
review+
|
Details | Diff | Splinter Review |
5.98 KB,
patch
|
davida
:
review+
Bienvenu
:
review+
|
Details | Diff | Splinter Review |
1.59 KB,
patch
|
Details | Diff | Splinter Review | |
3.76 KB,
patch
|
davida
:
review+
Bienvenu
:
review+
|
Details | Diff | Splinter Review |
User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-GB; rv:1.8.1.7) Gecko/20070914 Firefox/2.0.0.7
Build Identifier: version 3.0a1pre (2007092503)
Nightlies/RCs/Beta builds should have a different icon to full releases like Firefox - this will be good for differentiating between the different builds on the dock (or similar for Windows).
This is already implemented in Firefox, with the fox only appearing in releases, just the globe on its own in Nightly/RC/Beta releases.
Reproducible: Always
Steps to Reproduce:
1.Download nightly/rc/beta Thunderbird
2.Open it
3.Get confused between the last release and the newly opened nightly/rc/beta build on the dock because the icons are the same
Expected Results:
Display a different icon on the dock (or similar for Windows) for non-release builds.
Comment 1•17 years ago
|
||
To clarify what Firefox does, there are three classes of branding:
official - Firefox (fox on globe) icon, named Firefox
used for beta releases and later, including RCs for major & point releases
"unofficial" - plain globe icon, named after codename (Bon Echo, Gran Paradiso)
used for alphas (to discourage end-users)
unbranded - globe with dynamite icon, named Minefield
used for nightlies
RC builds must have the full official branding to be a true release candidate, and for beta we're trying to get more testers so there's less need to discourage people by changing the name.
Updated•17 years ago
|
QA Contact: build → build-config
Assignee | ||
Comment 2•17 years ago
|
||
Not sure how far we're going with Shredder, and icons, so I don't know if we want this bug to its entirety - cc'ing David who probably has a better idea than me.
Depends on: 433630
If i would follow comment #1 classes I would:
-1.official Tb -ok
-2.unofficial -to be established like in bug 433630
But, with less alarming tints than 3?
-3.unbranded -to be established like in bug 433630
But, with red! tints or something to alarm people
An element would be necessary though for distinguish 2-3 for color challenged people.
Also, about FF approach, note that the globe is basically the original logo without the fox, while the minefield adds the dinamite. Which makes it a very subtle connection ..
Assignee | ||
Comment 4•17 years ago
|
||
So this is what we are going to do:
official builds (betas, RCs, full releases):
- Use Thunderbird etc as we do now, use the official Thunderbird logo.
unofficial/unbranded builds (all nightlies, alphas, default self-builds):
- Use "Shredder", use current icon for now, but bug 433630 will provide one later.
So we'll need to change:
http://mxr.mozilla.org/seamonkey/source/mail/locales/en-US/chrome/branding/brand.dtd
and the associated properties file.
KaiRo tells me that Gran Paradiso locale file is only included via en-US on Firefox, or at least is only pulled in from one central location. I might look at doing that here, but my priority is to get something up for Alpha 2 so that we can release it as Shredder.
Assignee: nobody → bugzilla
Status: UNCONFIRMED → NEW
Ever confirmed: true
Flags: blocking-thunderbird3.0a2+
OS: Mac OS X → All
Hardware: Macintosh → All
Version: unspecified → Trunk
Comment 5•17 years ago
|
||
I just recently unbroke unofficial branding for Firefox 3.0.x nightlies, see http://mxr.mozilla.org/mozilla/source/browser/branding/unofficial/locales/. The trick was to hardcode en-US in jar.mn, then you don't have to expose the unofficial branding dir to localization.
Assignee | ||
Comment 6•17 years ago
|
||
This is based on what Firefox does. This patch will:
* Not affect branded builds
* For unbranded builds it will display as "Shredder" but not affect the executable/package names.
We will need to do an additional change to the tinderbox configurations to drop the offical branding flag.
** The other question:
When Firefox did alpha releases, they renamed the packaging to "Gran Paradiso". This didn't affect the actual executable name, but did do things like make the download package be called "granparadiso-foo.dmg" rather than "firefox-foo.dmg".
Do we want to do the same? So that for alpha releases, folks will be downloading shredder-foo.dmg?
I suggest nightlies just stay like they are with Shredder text branding (as per Firefox).
Whichever way we do this, I think this patch will be able to go in as-is, if not, then I may redo the new directory to be mail/branding/nightly, but that would be the only difference - we can definitely get the main name changes redone for a2, but hopefully we can do the packaging changes as well if necessary if I know soon enough.
Attachment #327694 -
Flags: review?(david.ascher)
Attachment #327694 -
Flags: review?(bienvenu)
Assignee | ||
Comment 7•17 years ago
|
||
Oh, btw, I've used some hg move commands in this patch. For doing the actual changes in cvs, I'll just add the brand.dtd and brand.properties as new files and remove the old, as there is no history worth keeping there.
Comment 8•17 years ago
|
||
Comment on attachment 327694 [details] [diff] [review]
[checked in] Provide updated Shredder Unofficial branding.
-<!ENTITY vendorShortName "Mozilla">
+<!ENTITY vendorShortName "mozilla.org">
Why this change?
Apart from that, seems fine.
I do think that having shredder-based executable names instead of thunderbird-based would be good.
but r+ from me, as I suspect that change would be in addition to this one.
Attachment #327694 -
Flags: review?(david.ascher) → review+
Comment 9•17 years ago
|
||
Modulo David's comment, this all looks fine, except, why the SignonViewer stuff?
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -156,8 +156,3 @@
locale/@AB_CD@/communicator/wallet/wallet.properties (%chrome/communicator/wallet/wallet.properties)
+ locale/@AB_CD@/communicator/wallet/SignonViewer.properties (%chrome/communicator/wallet/SignonViewer.properties)
+ locale/@AB_CD@/communicator/wallet/SignonViewer.dtd (%chrome/communicator/wallet/SignonViewer.dtd)
Comment 10•17 years ago
|
||
(In reply to comment #8)
> I do think that having shredder-based executable names instead of
> thunderbird-based would be good.
Doesn't that lead to broken shortcuts (eg on windows) if the user is updated from 3.0aN to 3.0b1 or later ? The updater doesn't touch anything like that, they're created when the app is first installed.
Comment 11•17 years ago
|
||
FWIW I have always found the "different" icon and title/app name, and putting the application in a directory appropriately named, to be sufficient for FF test builds. Doesn't FF "minefield" by default install to /mozilla minefield/ instead of /mozila firefox/? (I do custom install so I no longer remember) Should Shedder install follow that model?
Is there a reason we'd want to change the executable name?
Comment 12•17 years ago
|
||
The directory is bug 435657. I don't recall the actual executables having different names in ff alphas, at least linux nighties didn't. (Or do you mean the installer exe?)
Assignee | ||
Comment 13•17 years ago
|
||
(In reply to comment #8)
> (From update of attachment 327694 [details] [diff] [review])
> -<!ENTITY vendorShortName "Mozilla">
> +<!ENTITY vendorShortName "mozilla.org">
>
> Why this change?
Well, I was basing it on what I thought Firefox did. Though I've just checked again, currently they use "Mozilla" for nightlies and beta/final releases, and "mozilla.org" for their alphas. I think they generally use "mozilla.org" for unofficial type things.
> I do think that having shredder-based executable names instead of
> thunderbird-based would be good.
I didn't say quite say that, but I think we could continue to have this discussion in bug 435657 - I'll do some more checking as to what they actually do as well.
> but r+ from me, as I suspect that change would be in addition to this one.
Correct
(In reply to comment #9)
> Modulo David's comment, this all looks fine, except, why the SignonViewer
> stuff?
Look carefully at the file ;-) There's a space before those "+". We are actually overriding some other files (the ones in extensions/wallet) so that localisation happens correctly, hence they have a "+" on already.
Assignee | ||
Comment 14•17 years ago
|
||
Tinderbox configuration changes for the nightly builds.
David and the rest of us wish to drop official branding for nightly builds, and use the new Shredder branding (see the rest of this bug). Additionally I'd like to get the tinderboxes throwing out the new builds asap so I can check them before I go on holiday.
Ben would you be able to approve this asap? - three configuration changes to the Thunderbird tinderboxes.
Attachment #327783 -
Flags: review?(bhearsum)
Updated•17 years ago
|
Attachment #327694 -
Flags: review?(bienvenu) → review+
Assignee | ||
Comment 15•17 years ago
|
||
I am now starting to check out the installer changes for Windows.
The appropriate file to change I believe is http://mxr.mozilla.org/seamonkey/source/mail/installer/windows/nsis/branding.nsi#40
There are three values to consider (shown in quotes is the current value):
BrandShortName "Thunderbird"
BrandFullName "Mozilla Thunderbird"
BrandFullNameInternal "Mozilla Thunderbird"
To change most of the text on the installer, BrandShortName should become "Shredder", that's the easy bit.
If we change BrandFullName to "Shredder" then I believe that:
* Icons on the desktop will be "Shredder" as opposed to "Mozilla Thunderbird"
* The default installation location will become "Program Files\Shredder"
This will not affect the profile location.
I think that BrandFullNameInternal should change to match BrandFullName, however the comments are a bit cryptic:
# BrandFullNameInternal is used for some registry and file system values that
# should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
So this seems to affect the registry keys. Firefox has BrandFullName and BrandFullNameInternal matching, so I think we should do the same.
Thoughts on all this would be useful.
Updated•17 years ago
|
Attachment #327783 -
Flags: review?(bhearsum) → review?(robert)
Comment 16•17 years ago
|
||
Comment on attachment 327783 [details] [diff] [review]
[checked in] Tinderbox config changes
Moved r? at Mark/bhearsum's request.
Updated•17 years ago
|
Attachment #327783 -
Flags: review?(robert) → review+
![]() |
||
Comment 17•17 years ago
|
||
(In reply to comment #15)
Keep in mind mozilla\browser\branding\unofficial as well
> I think that BrandFullNameInternal should change to match BrandFullName,
> however the comments are a bit cryptic:
>
> # BrandFullNameInternal is used for some registry and file system values that
> # should not contain release that may be in the BrandFullName (e.g. Beta 1,
> etc.)
>
> So this seems to affect the registry keys. Firefox has BrandFullName and
> BrandFullNameInternal matching, so I think we should do the same.
>
> Thoughts on all this would be useful.
See Bug 343825... this allows us to have a different installation directory name (e.g. Mozilla Firefox Beta 1, etc.) without it polluting the registry with that same "one off" name.
Assignee | ||
Comment 18•17 years ago
|
||
(In reply to comment #17)
> (In reply to comment #15)
> > I think that BrandFullNameInternal should change to match BrandFullName,
> > however the comments are a bit cryptic:
> >
> > # BrandFullNameInternal is used for some registry and file system values that
> > # should not contain release that may be in the BrandFullName (e.g. Beta 1,
> > etc.)
> >
> > So this seems to affect the registry keys. Firefox has BrandFullName and
> > BrandFullNameInternal matching, so I think we should do the same.
> >
> > Thoughts on all this would be useful.
> See Bug 343825... this allows us to have a different installation directory
> name (e.g. Mozilla Firefox Beta 1, etc.) without it polluting the registry with
> that same "one off" name.
>
So if I read this and other things right, for Alpha releases, we should just install into Shredder, and therefore change BrandFullName* to be consistently Shredder (which is what I think Firefox did with Gran Paradiso).
When it comes to doing Beta releases, we should have --enable-offical-branding with BrandFullNameInternal set to "Mozilla Thundebird 3 beta 1" and BrandFullName set to "Mozilla Thunderbird".
Rob, have I understood this correctly?
![]() |
||
Comment 19•17 years ago
|
||
Assignee | ||
Updated•17 years ago
|
Attachment #327694 -
Attachment description: Provide updated Shredder Unofficial branding. → [checked in] Provide updated Shredder Unofficial branding.
Assignee | ||
Updated•17 years ago
|
Attachment #327783 -
Attachment description: Tinderbox config changes → [checked in] Tinderbox config changes
Assignee | ||
Comment 20•17 years ago
|
||
So now I've learnt a bit more. This patch continues on from the one I've already checked in, most of this is syncing us to be the same as Firefox build:
* Set MOZ_APP_DISPLAYNAME appropriately for the branding - this uses configure.sh files, there's some magic in the main configure.in that will load the right one in for us.
* Associated with the previous step, move the newly created mail/branding/unofficial directory to mail/branding/nightly - this allows configure.in to pull in the correct configure.sh for nightlies, and avoids us having to specify a default directory.
* Sync the comments in the branding.nsi files with the Firefox versions.
* Change the nightly branding.nsi file so that the installer will install to "Program Files\Shredder" rather than "Program Files\Mozilla Thunderbird" and also so that it will be branded as "Shredder".
* Make the mac .app name be based on the MOZ_APP_DISPLAYNAME (i.e. Thunderbird or Shredder) - again, this is a sync with what Firefox does.
For reference, the naming of the package on the ftp server is defined/set up at the build/release stage, hence not part of this bug.
There may be one or two more references that need changing, I'll be hunting those down tomorrow.
Attachment #327867 -
Flags: review?(david.ascher)
Attachment #327867 -
Flags: review?(bienvenu)
Comment 21•17 years ago
|
||
(In reply to comment #10)
> (In reply to comment #8)
> > I do think that having shredder-based executable names instead of
> > thunderbird-based would be good.
>
> Doesn't that lead to broken shortcuts (eg on windows) if the user is updated
> from 3.0aN to 3.0b1 or later ? The updater doesn't touch anything like that,
> they're created when the app is first installed.
>
It certainly would in my usage, I'm running 3 versions in 3 locations with separate profiles pointed to through desktop icon targets.
I use software update on all of them.
Comment 22•17 years ago
|
||
Comment on attachment 327867 [details] [diff] [review]
[checked in] Provide updated Shredder Unofficial branding part 2.
-tier_app_dirs += mail/branding/unofficial
+tier_app_dirs += mail/branding/nightly
someone will have to explain the difference between unofficial and nightly to me someday, but apart from that looks ok to me.
Attachment #327867 -
Flags: review?(david.ascher) → review+
Comment 23•17 years ago
|
||
Comment on attachment 327867 [details] [diff] [review]
[checked in] Provide updated Shredder Unofficial branding part 2.
this looks ok to me, but I'm having a bit of fun trying to get the patch to apply - it doesn't like this part:
rename from mail/branding/unofficial/locales/en-US/brand.dtd
rename to mail/branding/nightly/locales/en-US/brand.dtd
but maybe my tree wasn't fully checked out.
Attachment #327867 -
Flags: review?(bienvenu) → review+
Assignee | ||
Comment 24•17 years ago
|
||
(In reply to comment #22)
> (From update of attachment 327867 [details] [diff] [review])
> -tier_app_dirs += mail/branding/unofficial
> +tier_app_dirs += mail/branding/nightly
>
> someone will have to explain the difference between unofficial and nightly to
> me someday, but apart from that looks ok to me.
>
In our context unofficial = nightly, but if we call it nightly, then it simplifies getting this to work in all situations.
In Firefox context, unofficial means "an alpha release" i.e. we're releasing something for devs to look at, but its not a nightly, and its also not a end-user release.
(In reply to comment #23)
> (From update of attachment 327867 [details] [diff] [review])
> this looks ok to me, but I'm having a bit of fun trying to get the patch to
> apply - it doesn't like this part:
>
> rename from mail/branding/unofficial/locales/en-US/brand.dtd
> rename to mail/branding/nightly/locales/en-US/brand.dtd
>
> but maybe my tree wasn't fully checked out.
Sorry, that's probably patch not liking the hg diff. I'm checking this in anyway as I'd like to see it through today's nightlies in case we get any problems (and leave me with the rest of today/tomorrow for any other problems).
Updated•17 years ago
|
Status: NEW → ASSIGNED
Updated•17 years ago
|
Assignee: bugzilla → nobody
Status: ASSIGNED → NEW
Updated•17 years ago
|
Assignee: nobody → bugzilla
Updated•17 years ago
|
Status: NEW → ASSIGNED
Comment 25•17 years ago
|
||
Comment on attachment 327867 [details] [diff] [review]
[checked in] Provide updated Shredder Unofficial branding part 2.
>+# Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
>+# directory in the registry and using that as the default. This prevents
>+# Beta releases built with official branding from finding an existing install
>+# of an official release and defaulting to its installation directory.
This isn't true at all for Thunderbird, as the NSIS code for mail/ is missing this functionality.
Assignee | ||
Comment 26•17 years ago
|
||
(In reply to comment #25)
> (From update of attachment 327867 [details] [diff] [review])
> >+# Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
> >+# directory in the registry and using that as the default. This prevents
> >+# Beta releases built with official branding from finding an existing install
> >+# of an official release and defaulting to its installation directory.
>
> This isn't true at all for Thunderbird, as the NSIS code for mail/ is missing
> this functionality.
>
Well spotted, I've filed bug 443358 to port the appropriate code.
Also updating the title to reflect what we're really doing in this bug - bug 433630 will handle the icon changes for us.
Flags: in-testsuite-
Summary: Nightlies/RCs/Beta builds should have a different icon to full releases like Firefox → Thunderbird Nightlies/RCs/Beta builds should have different branding to full releases like Firefox
Target Milestone: --- → Thunderbird 3
Assignee | ||
Updated•17 years ago
|
Priority: -- → P1
Assignee | ||
Updated•17 years ago
|
Attachment #327867 -
Attachment description: Provide updated Shredder Unofficial branding part 2. → [checked in] Provide updated Shredder Unofficial branding part 2.
Assignee | ||
Comment 27•17 years ago
|
||
When I checked in the part 2 changes earlier today, Linux and Windows were fine. Mac however had several problems:
- The ProductName in tinder-config.pl needed changing to "Shredder" (I also removed the Vendor Id being set to Mozilla, it doesn't have any effect anyway, and makes it consistent with the other tinder-config.pl files).
- build-seamonkey-util.pl needed an additional override in get_profile_dir. Firefox & Sunbird already have these for their unofficial/nightly branding, I'm just copying the same.
The above two had r=reed.
However the tinderboxes didn't seem to pick up the build-seamonkey-util.pl, so I ended up backing out the ProfileName change to tinder-config.pl, and the mail/app/Makefile.in change from "part 2".
Due to some more lovely packaging changes, I also then had to change MOZ_APP_DISPLAYNAME from "Shredder" to "Thunderbird" in mail/branding/nightly/configure.sh.
I think that these backouts won't have any effect on the branding (but we should do them anyway to be consistent), so I'll handle them and the tinderbox problems in separate bugs that'll I'll mark as dependent on this one.
Assignee | ||
Comment 28•17 years ago
|
||
I think this is the last patch for this bug. It changes the unofficial branding license file on Mac such that:
- We have Accept and Decline buttons (this is to bring us in line with Firefox, and with our official branding license file).
- We reference Shredder instead of Mozilla Thunderbird (again this is the similar to what Firefox does)
I'm not going to change the windows license files that the installer displays - they use Mozilla Firefox even though the app is branded Minefield.
I'm also not changing Mozilla Corporation/Foundation -> Mozilla Messaging here as that is a different bug.
After this patch I think we're good to go for release (without updated icons of course), though ideally fixing bug 443398 first if we can.
Attachment #327967 -
Flags: review?(david.ascher)
Attachment #327967 -
Flags: review?(bienvenu)
Updated•17 years ago
|
Attachment #327967 -
Flags: review?(david.ascher) → review+
Updated•17 years ago
|
Attachment #327967 -
Flags: review?(bienvenu) → review+
Assignee | ||
Updated•17 years ago
|
Attachment #327967 -
Attachment description: Update mac license display and file → [checked in] Update mac license display and file
Assignee | ||
Comment 29•17 years ago
|
||
Last patch checked in, so I think this is good enough for release - bug 443398 covers the remaining changes need to finish this.
Status: ASSIGNED → RESOLVED
Closed: 17 years ago
Resolution: --- → FIXED
Comment 30•17 years ago
|
||
Looks good with Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.2pre) Gecko/2008070803 Thunderbird/3.0a2pre ID:2008070803
I'll follow the remaining changes on bug 443398 so we can completely be sure that Thunderbird isn't visible anywhere else. Just right now it's a great step! Thanks Mark! Marking verified.
Status: RESOLVED → VERIFIED
![]() |
||
Comment 31•17 years ago
|
||
This does cause one problem in that the Registry Key name under HKLM\Software\Clients\Mail typically shouldn't change for nightly or release builds.
http://mxr.mozilla.org/mozilla/source/mail/installer/windows/nsis/shared.nsh#87
Another option would be to clean up these keys when installing a nightly into a directory that previously was a release build and vice versa but that would cause the user to be prompted to set the app as default when the previous installation was already default.
Perhaps this will be taken care of elsewhere but the HKLM\Software\Clients\Mail\Shredder\Capabilities ApplicationName is still Thunderbird
Comment 32•17 years ago
|
||
(In reply to comment #31)
> Perhaps this will be taken care of elsewhere but the
> HKLM\Software\Clients\Mail\Shredder\Capabilities ApplicationName is still
> Thunderbird
Robert, I believe that this will be covered by bug 443398.
Assignee | ||
Comment 33•17 years ago
|
||
(In reply to comment #31)
> This does cause one problem in that the Registry Key name under
> HKLM\Software\Clients\Mail typically shouldn't change for nightly or release
> builds.
...
> Perhaps this will be taken care of elsewhere but the
> HKLM\Software\Clients\Mail\Shredder\Capabilities ApplicationName is still
> Thunderbird
>
I've filed bug 444940 for both of these issues.
Comment 34•17 years ago
|
||
Adding bug 446367 instead of bug 448475 to the blocker list after I filed a duplicate.
You need to log in
before you can comment on or make changes to this bug.
Description
•