306020 - Enable official branding and set version to "Firefox 1.5 Beta 1" for upcoming 1.8b4 milestone release

Status: RESOLVED FIXED

(Firefox :: General, defect, P1)

Description

[Chris Beard]

During the Deer Park development cycle we've used the code name instead of
official branding for our alpha releases.  For the upcoming beta releases we
want to enable official branding -- to encourage wider testing and feedback. 
For the 1.8b4 milestone release, we should rebrand from "Deer Park Alpha 2" to
"Firefox 1.5 Beta 1".

Comment 1

[Chris Beard]

I understand that the approaching to naming may well break out intended testing
of software updates ability to manipulate registry keys.  What approaches can we
take here?

Ideally:
- We want to enable official branding for the upcoming beta releases in order to
drive wider testing
- Users should be able to easily differentiate between one or more beta releases
- Updating from Beta1 -> Beta2 should be seemless (as our primary field testing
at scale of software update)

Comment 2

[Benjamin Smedberg]

- Users should be able to easily differentiate between one or more beta releases'

What does this mean? By opening the about dialog, or something more obvious than
that?

Comment 3

[Mike Connor [:mconnor]]

I think in this case we want someone to be able to tell easily what they're
running, so that's really more of the in-app branding.

The installer text can be otherwise tweaked.  I don't remember right now which
values at
http://lxr.mozilla.org/mozilla/source/browser/installer/windows/installer.cfg#4
 correspond to the registry entries, and which correspond to the bits visible in
the installer, but hopefully the internal name is used for the registry/install
path, and the other is used for the installer strings.

Moving to bsmedberg since he hopefully has cycles to figure out the compromise
between identity and testing is.

Comment 4

[David B. Haun]

There is a second bug number 304661 which is designed to cause the same thing
very closely.

Comment 5

[Benjamin Smedberg]

Until we fix bug 301250 (which is way too complex for the branch), there is no
safe way to change just some strings and not affect the testing of software
update. I think we should just be Mozilla Firefox, and perhaps hardcode " -
Beta" in the window title directly if that's absolutely necessary.

Comment 6

[Chase Phillips]

bsmedberg: give the signal when you're ready for me to put
--enable-official-branding back on the branch build systems.  (I presume we can
turn it on for the trunk at our earliest convenience.)

Comment 7

[Benjamin Smedberg]

Attachment: Add "- Beta" in a few spots

Comment 8

[Scott MacGregor]

Comment on attachment 194444 [details] [diff] [review]
Add "- Beta" in a few spots

These patches should say Beta 1 so we can later change them to Beta 2.

Also, I think we should be hard coding the about dialog as well so users see:

version 1.5 Beta 1
and 
version 1.5 Beta 2

instead of

version 1.4

Comment 9

[Benjamin Smedberg]

I really think we don't need to and ought not to specify beta 1 or beta 2...
beta is sufficient. I can add " - beta" to the about dialog also, so it would
read "version 1.4 - beta"

Comment 10

[Scott MacGregor]

(In reply to comment #9)
> I really think we don't need to and ought not to specify beta 1 or beta 2...
> beta is sufficient. I can add " - beta" to the about dialog also, so it would
> read "version 1.4 - beta"

For starers we should be showing version 1.5 - beta, not 1.4 - beta. That means
we also have to have the beta # to distinguish the two builds easily for end users.

version 1.5 beta 1
version 1.5 beta 2

The 1.4 version should only appear in the user agent string in the about dialog.
We are hiding that our internal app version is 1.4 from end users using the beta
release as much as possible. To end users this is version 1.5 beta 1.

Comment 11

[Benjamin Smedberg]

We do not have the ability to thoroughly disentangle the "1.4" version string
from what the user sees. But where other than the about box does the user see
the version anyway?

Comment 12

[Scott MacGregor]

I'm only talking about the about dialog as well. We want it to read

version 1.5 Beta 1

with the user agent underneath it in small print like it does today saying 1.4

Comment 13

[Ben Goodger (use ben at mozilla dot org for email)]

if you say Firefox 1.4 - Beta you may confuse people into thinking there's going
to be a 1.4. (Trust me, people are excitable about such things)

What about Firefox 1.4 - (1.5 Beta 1)

or some such. 

Comment 14

[Ben Goodger (use ben at mozilla dot org for email)]

Ah - what scott said. The about dialog can easily have its version display text
hard coded to say "Firefox 1.5 Beta 1" and "Thunderbird 1.5 Beta 1"

Comment 15

[Asa Dotzler [:asa]]

if the existing patch is no good, can we minus it or obsolte it and get a new
patch attached? time is getting short.

Comment 16

[Sébastien Auger]

firefox 1.5 beta 1 plain and simple would be the best thing to do.
It's not necessary to put 1.4 too ..

Comment 17

[Scott MacGregor]

Attachment: [fixed on the branch] Thunderbird changes to show 1.5 Beta1 in the about dialog

1) Hard codes the about dialog to say

version 1.5 Beta 1 (##build id##)

instead of

version 1.4 (## build id ##)

2) Installer welcome dialog says Mozilla Thunderbird Beta 1

3) Removed the Alpha 2 string from the branding file so we now just say
Thunderbird in the menus instead of Thunderbird Alpha 2.

Comment 18

[Benjamin Smedberg]

Comment on attachment 194711 [details] [diff] [review]
[fixed on the branch] Thunderbird changes to show 1.5 Beta1 in the about dialog

I still think we should have "1.4" somewhere more prominent than just the
useragent string. It is the version used in extension updates and other stuff.
But this is ok.

Comment 19

[Scott MacGregor]

Attachment: Firefox Beta Branding Changes

I wanted to jump start the original patch in this bug for the Firefox branding
changes as we'd really like to get this stuff done over the weekend. Here's an
initial patch to do just that.

1) Removes the alpha 2 references, reverting generic branding back to just Deer
Park.

2) About dialog (screen shot coming up) is now hard coded to say
version 1.5 Beta 1

3) The main browser window title now reads " - Deer Park Beta 1". So if you are
visiting a site, you will see across the top: 'Espn.com - Deer Park Beta 1"

4) The installer welcome screen now says "Welcome to Deer Park Beta 1". BUT,
the smaller text will say "You are about to install Deer Park 1.4". Do we want
to hard code more strings in this dialog or is the big welcome text enough?
Also, I haven't built and installer build yet, so this may need tweaked later
if the Beta 1 string gets clipped by the end of the dialog. 

Everywhere else in the UI will say just Deer Park. No more Alpha 2 or Beta one
in any of the menus, etc. 

Note: Of course once the official branding comes back on, all occurrences of
Deer Park will rever to Firefox.

Comment 20

[Scott MacGregor]

Attachment: screen shot of the about dialog

Comment 21

[Scott MacGregor]

Comment on attachment 194711 [details] [diff] [review]
[fixed on the branch] Thunderbird changes to show 1.5 Beta1 in the about dialog

ok, the Thunderbird changes are all done.

Comment 22

[Asa Dotzler [:asa]]

Comment on attachment 194714 [details] [diff] [review]
Firefox Beta Branding Changes

a=asa as soon as this has sr, please land.

Comment 23

[Mike Schroepfer]

Do we need to change the graphics as well?

Comment 24

[Scott MacGregor]

(In reply to comment #23)
> Do we need to change the graphics as well?
> 

once this change is checked in, we'll flip the official branding flag on the
build machines. This means: official artwork, deer park becomes Firefox in the UI.

Comment 25

[Benjamin Smedberg]

Schrep, the actual process of re-enabling the official branding is done by Chase
on the build machines (adding the --enable-official-branding configure flag);
this switches to using the "Firefox" name and the fox iconography.

Comment 26

[Asaf Romano (gone)]

For Beta, what would like the mac application menu label to be (note: this is
hardcocded)?

Comment 27

[Mike Connor [:mconnor]]

Scott, I don't think we've fixed official branding strings in the installer
(unless I totally missed something since the Firefox->Deer Park change) so this
will say "Deer Park" even if we flip the branding switch.  You also missed the
Unix installer.cfg, unless (dare I hope?) we're not shipping that anymore?

Comment 28

[Scott MacGregor]

(In reply to comment #27)
> Scott, I don't think we've fixed official branding strings in the installer
> (unless I totally missed something since the Firefox->Deer Park change) so this
> will say "Deer Park" even if we flip the branding switch.  You also missed the
> Unix installer.cfg, unless (dare I hope?) we're not shipping that anymore?

Mike, I was going to change installer.cfg to say Firefox at the same time as the
build config change gets switched. Otherwise we'll have installers that say
Firefox but install Deerpark and It hoguht that would be weird. 

I'll change installer.cfg for Unix too.

Comment 29

[Ben Goodger (use ben at mozilla dot org for email)]

Comment on attachment 194714 [details] [diff] [review]
Firefox Beta Branding Changes

sr=[e-mail]

It is my understanding the builds will say "Firefox" for the beta release. In
this case, sr=[e-mail]

Comment 30

[Scott MacGregor]

This has been checked into the branch. I also changed the installer strings to
say Mozilla Firefox instead of Deer Park instead of waiting for the branding
flag to get thrown.

The remaining piece of the puzzle is a build configuration change to the build
machines to include the official branding flag. I can do this but will check
with Chase to make sure he's ok with me doing it.

Comment 31

[Scott MacGregor]

(In reply to comment #26)
> For Beta, what would like the mac application menu label to be (note: this is
> hardcocded)?

It should say "Firefox". If you make a patch fixing the string in the
appropriate InfoList file, I'll sr and approve it for the branch. Otherwise this
will have to wait until tomorrow when I have access to a Mac machine at the office.

Comment 32

[Scott MacGregor]

I should point out that this also means that the branch builds will now install
into Program Files\Mozilla Firefox instead of Program Files\Deer Park Alpha 2.

We still need to do something special with the Windows installer screen to make
it show Beta 1 somewhere. The original patch appened Beta 1 to the welome text
(Welcome to Mozilla Firefox - Beta 1). But that string is way too wide for the
installer dialog so you never actually see the Beta 1 text anyway. 

I'll talk withBen tomorrow about different ideas we could make here.

Comment 33

[Scott MacGregor]

Attachment: string change to make the installer look better

This causes the first page of the installer to say:

You are about to install Mozilla Firefox Beta 1. (Used to be You are about to
Install Mozilla Firefox).

and

Click Next to continue installing Mozilla Firefox Beta 1. (Used to be ...
installing Mozilla Firefox.).

This makes it clear that you are installing a beta instead of a regular Firefox
release when you start up the installer. I had to make this change at the
locale file level in order instead of installer.cfg because we want the
application to be installed into Program files\Mozilla Firefox instead of
Program Files\Mozilla Firefox Beta 1. Furthermore, we couldn't manually change
config.it to append Beta 1 to these two welcome strings because that caused the
Beta one text to appear after the '.' in the two strings.

Comment 34

[Scott MacGregor]

Attachment: screen shot of the installer with the Beta 1 text

Comment 35

[Chris Beard]

a=cbeard for replacing "Deer Park" with "Firefox" in menu title of Application
menu on Mac when --enable-official-branding is set

Comment 36

[Asaf Romano (gone)]

I will take care of that once offical branding is on.

Comment 37

[Scott MacGregor]

I've flipped the official branding flag on the following builds:

pacifica (windows)
atlantia (Mac)
prometheus (Linux)

These are the builds responsible for nightly builds. 

Asaf please check in the application menu change now too. 

Furthermore, per chase, I've update the update channel from "nightly" to "beta"
on these three Firefox machines and the three Thunderbird machines (patrocles,
triton, crazyhorse).

Comment 38

[Asaf Romano (gone)]

Scott, note that once you turn on offical branding on atlantia, it will burn.
The tbox scripts points it to DeerPark.app.

Comment 39

[Asaf Romano (gone)]

mozilla/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings 1.7

Comment 40

[Scott MacGregor]

Attachment: updated installer patch

just to keep things tidy for historical purposes when we go to change all this
stuff again.

Ben and I decided the installer text should say 1.5 Beta 1 instead of just beta
1. i.e. Mozilla Firefox 1.5 Beta 1.

This patch does that for firefox and thunderbird and is now checked into the
branch.

r=benjamin sr=ben

Comment 41

[Scott MacGregor]

At this time I don't belive there is any more remaining work to do for this for
Beta 1. All of these things will have to get revved again for beta 2 of course.

Comment 42

[Scott MacGregor]

(In reply to comment #38)
> Scott, note that once you turn on offical branding on atlantia, it will burn.
> The tbox scripts points it to DeerPark.app.

Thanks Asaf. I just changed the tinderbox script on Atlantia to reflect this.
The next cycle may go red before this change takes.

Comment 43

[Asaf Romano (gone)]

So, it looks like offical branding isn't enabled on Atlantia.

Comment 44

[Scott MacGregor]

I wonder if this new packaging script on the Mac:

http://lxr.mozilla.org/seamonkey/source/build/package/mac_osx/pkg-dmg#233

needs to be aware of the official-branding flag? 

cc'ing Mark who added that file in August after we were making only generic builds. 

Comment 45

[Mark Mentovai]

pkg-dmg knows all it needs to about branding, which is to say, it knows nothing
because branding is all handled by the make magic.  The branded bits* for the
dmg are brought in from other-licenses/branding (official branding on) or
whatever/app (off) just like other branding-sensitive things.  Branded bits were
introduced in the same bug that introduced pkg-dmg.

I've tested officially-branded dmgs thoroughly.  Thunderbird builds seem to have
had official branding turned on since I landed the new packager, nightlies and
hourlies are already available with their "official" look.

* bits = EULA, disk icon, and window background; see bug 283598 for new artwork
(not yet checked in).

Comment 46

[Scott MacGregor]

(In reply to comment #45)
> pkg-dmg knows all it needs to about branding, which is to say, it knows nothing
> because branding is all handled by the make magic.  The branded bits* for the
> dmg are brought in from other-licenses/branding (official branding on) or
> whatever/app (off) just like other branding-sensitive things.  Branded bits were
> introduced in the same bug that introduced pkg-dmg.

Ok, I was worried about all the Deerpark references I saw hard coded in that
file which I didn't think would work when we are dealing with Firefox.app
instead of Deerpark.app. Thanks for clarifying that magic makes it work :)

Comment 47

[Mark Mentovai]

Attachment: Mac Firefox official branding bustage fix

The problem is that official Mac Firefox builds need MOZ_USE_OFFICIAL_BRANDING
defined somewhere in addition to being configured with
--enable-official-branding in order to get the proper APP_NAME.  (I've been
doing it in the environment.)  MOZ_USE_OFFICIAL_BRANDING is no longer set
anywhere by the build system.  It doesn't make a difference for Thunderbird
because official and unofficial both use the same name.

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

This patch fixes the officially-branded Mac Firefox build, but other uses of
MOZ_USE_OFFICIAL_BRANDING should be cleaned up too.

Comment 48

[Scott MacGregor]

Comment on attachment 195095 [details] [diff] [review]
Mac Firefox official branding bustage fix

thank you! I've been staring at tinderbox logs trying to figure out what was
causing this. Can you check this in ASAP? otherwise I can for you.

Comment 49

[Scott MacGregor]

Comment on attachment 195095 [details] [diff] [review]
Mac Firefox official branding bustage fix

Note: I believe this is a safe and correct thing to do. I see us using
MOZ_APP_DISPLAYNAME with the .app name in several other Makefiles such as:

http://lxr.mozilla.org/mozilla/source/tools/update-packaging/Makefile.in#53

Comment 50

[Mark Mentovai]

Checking in trunk/mozilla/browser/app/Makefile.in;
/cvsroot/mozilla/browser/app/Makefile.in,v  <--  Makefile.in
new revision: 1.89; previous revision: 1.88
done
Checking in 1.8/mozilla/browser/app/Makefile.in;
/cvsroot/mozilla/browser/app/Makefile.in,v  <--  Makefile.in
new revision: 1.85.2.5; previous revision: 1.85.2.4
done

Comment 51

[Mark Mentovai]

FYI, MOZ_USE_OFFICIAL_BRANDING was pulled out in bug 269460, I filed bug 307299
for further cleanup.

Comment 52

[Mark Mentovai]

Attachment: More fixes for Mac Firefox official

The app name was still being set based on MOZ_USE_OFFICIAL_BRANDING in
configure.  I'm reintroducing MOZ_USE_OFFICIAL_BRANDING in configure.in ONLY
(not AC_SUBSTed, can't be used in makefiles) to handle this, because there's
really no other fantastic way to do it.  The only other option is to get rid of
the clause that sets the name of unofficial browsers to DeerPark in
configure.in:

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

The downside to that is, well, that unofficial builds will be called Firefox.

Comment 53

[Scott MacGregor]

Comment on attachment 195102 [details] [diff] [review]
More fixes for Mac Firefox official

we're desperate. Let's put this on the branch tonight and file a bug on the
trunk to get Benjamin's input on how to best fix this.

Comment 54

[Mark Mentovai]

Checked in on the branch only.

Comment 55

[Mark Mentovai]

Followups on this issue in bug 307299.