343825 - Enable official branding and set version to Firefox 2 Beta 1 for upcoming release

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Mike Schroepfer]

For the upcoming beta releases wewant to enable official branding -- to encourage wider testing and feedback. The official branding will be "Firefox 2 Beta 1"

Bug 306020 documents this procedure for 1.5 which should be mindful of those changes and problems/regressions caused.

Comment 1

[J. Paul Reed [:preed]]

On the build side, looks like the only change we need is adding --enable-official-branding to the mozconfig.

The tinder-config.pl is already using Firefox as the ProductName and Mozilla as the VendorName (on linux and win32); on Mac, ProductName is BonEcho, so I'm assuming I'll have to change it back to Firefox when that mozconfig flag gets flipped for all three.

Rob: let me know if you need/would like to review those configs.

Comment 2

[Mike Beltzner [:beltzner, not reading bugmail]]

Taking a quick look at the patches that were landed on bug 306020, I see that  ...

attachment 194714 [details] [diff] [review] 
 - changes the numeric version number to "Beta 1" in aboutDialog.xul, browser.xul and config.it
 - changes "Deer Park Alpha 2" back to "Deer Park" in several locations

attachment 195057 [details] [diff] [review]:
 - changes string in old installer

attachment 195095 [details] [diff] [review] and 195102 were hacks that seem to have been fixed more permanently by bug 307299, Mark, can you give me a confirmation or let me know if I need to do something else here? 

So, the required changes we need for this bug are:

1. get preed to flip the mozconfig to use --enable-official-branding
2. the same changes to aboutDialog.xul and browser.xul
3. update the version number in browser/app/module.ver and browser/config/version.txt
4. :rs needs to make sure his installer strings also use human-readable "Beta 1" suffixes, and change the default install dir to "\Program Files\Mozilla Firefox 2" on Windows

Preed's offered to do (1) in comment 1
I can put together a patch for (2), (3) and whatever else Mark tells me I need to do tonight or (more likely) tomorrow morning EDT.
Rob needs to put together a patch for (4)

Comment 3

[Mike Beltzner [:beltzner, not reading bugmail]]

cc'ing l10n; I don't really want to rev the entities in browser.xul and aboutDialog.xul for what's really a temporary change to using a suffix; however, the localization teams should know that if they want a localized version of the "Beta 1" suffix (or if they need to make it a prefix) this patch will show them where to make them.

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: adds "Beta 1" to aboutDialog.xul, browser.xul and updates version number

(asking shaver for review to get it done in EDT, and 'cause benjamin and dbaron are on vacation today)

Comment 5

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 228392 [details] [diff] [review]
adds "Beta 1" to aboutDialog.xul, browser.xul and updates version number

Actually, I bet it would be best to get Mark to review this as well to ensure I'm not missing any Mac changes that I should be making ...

Comment 6

[Mike Schroepfer]

Rob strong should weigh in here as well since he thought some of the changes in bug 339734 would remove the need to manually change this stuff for the installer.

Comment 7

[Mike Schroepfer]

Also - not sure we need the change to the AboutDialog.   With just the other changes it should say version 2.0b1 I believe.   Which imho is just fine.  

Comment 8

[Robert Strong (they/them - no direct email)]

I just got r+ from sspitzer on bug 339734 and a+ from beltzner for the branch patch. I am going to let it cycle on the trunk, check it into the branch, and verify a cycle there as well. I'll submit a patch for any remaining items I have for this bug tonight.

Comment 9

[Robert Strong (they/them - no direct email)]

Attachment: Wizard page 1

Bah... adding Beta 1 messes up the alignment of the first line of the wizard. I can probably change the font size for this text. I am going to do more testing and then I'll submit a patch for the branding changes, etc.

Comment 10

[Robert Strong (they/them - no direct email)]

Attachment: Wizard page 1 - better

I forgot to add 2.0 :P This looks better

Comment 11

[Robert Strong (they/them - no direct email)]

Attachment: Win32 Installer patch

This adds a new define so we don't write Mozilla Firefox Beta 1 to registry keys and shortcut names in the cases we shouldn't such as:
Software/Mozilla/Mozilla Firefox/version (AB_CD)/
Start Menu\Mozilla Firefox Beta 1\Mozilla Firefox.lnk
and other places

The patch does the following for issues where there is no good answer for supporting a side by side install:
* The default install directory is Mozilla Firefox 2.0 Beta 1
* I've set the names of the shortcuts in QuickLaunch and on the Desktop to Mozilla Firefox 2.0 Beta 1.lnk so as to not overwrite an existing shortcut of the same name.
* I named the start menu directory Mozilla Firefox 2.0 Beta 1 and left the shortcut names as Mozilla Firefox.lnk
There can only be one StartMenuInternet registry key (e.g. the system generated shortcut on the left top of the startmenu. There is no solution to overwriting and the installer will overwrite that for an existing install of Firefox. We could disable the overwriting for Beta 1 or leave it as is.

I could add another value of Mozilla Firefox 2.0 without the Beta 1 for the install directory, startmenu directory, and shortcut names to shorten them though this would add additional complexity.

Comment 12

[Robert Strong (they/them - no direct email)]

preed, I can review the tbox configs though I am only familiar with them in regards to the win32 installer which should be good to go with this last patch.

Comment 13

[Mark Mentovai]

Comment on attachment 228392 [details] [diff] [review]
adds "Beta 1" to aboutDialog.xul, browser.xul and updates version number

r+ in that there's nothing here that will hurt the Mac build.

Comment 14

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: adds "Beta 1" to browser.xul and updates version number

This only adds "Beta 1" to the window title string, minimizing change as per schrep's comment. I'm really fine either way, since I think version 2.0b1 is pretty understandable in the About... window.

Carrying a=mark over from previous patch, changing sr to vlad as he's actually a browser peer :)

Comment 15

[Mike Beltzner [:beltzner, not reading bugmail]]

er, bah, r=mark, not a=mark :)

Comment 16

[(not reading, please use [e-mail] instead)]

Comment on attachment 228411 [details] [diff] [review]
Win32 Installer patch

r=sspitzer

Comment 17

[Mike Schroepfer]

Comment on attachment 228411 [details] [diff] [review]
Win32 Installer patch

I believe cbeard wanted it "Firefox 2 Beta 1" rather than "Firefox 2.0 Beta 1"

Comment 18

[Mike Schroepfer]

Comment on attachment 228411 [details] [diff] [review]
Win32 Installer patch

Approved with change from 2.0->2

Comment 19

[Mike Schroepfer]

Comment on attachment 228431 [details] [diff] [review]
adds "Beta 1" to browser.xul and updates version number

Approved for landing once it has been review a+

Comment 20

[Robert Strong (they/them - no direct email)]

Comment on attachment 228411 [details] [diff] [review]
Win32 Installer patch

This patch has been checked in to the 1.8.1 branch

Comment 21

[Robert Strong (they/them - no direct email)]

Comment on attachment 228431 [details] [diff] [review]
adds "Beta 1" to browser.xul and updates version number

Patch checked in to the 1.8.1 branch

Comment 22

[(not reading, please use [e-mail] instead)]

on my mac, robert and I have built a fresh, branch build with "ac_add_options --enable-official-branding" in my mozconfig.

one problem I am seeing is with the "Application" menu (to the right of the Apple).

it still says "Bon Echo".  Note, the Help menu has the right thing as does the about dialog.

here comes a screen shot.

Comment 23

[(not reading, please use [e-mail] instead)]

Attachment: screen shot from "my" official 20b1 (mac) build

Comment 24

[(not reading, please use [e-mail] instead)]

thanks to asaf and mscott, we know where this is coming from now.

Firefox.app/Contents/Resources/en.lproj/InfoPlist.strings

working backwards to figure out what we need to fix.

Comment 25

[(not reading, please use [e-mail] instead)]

it's a binary file that is copied over from http://lxr.mozilla.org/mozilla1.8/source/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings

I think, for for tbird, it is not a binary file (see http://lxr.mozilla.org/mozilla1.8/source/mail/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings)

Comment 26

[(not reading, please use [e-mail] instead)]

asaf tells me over irc:  "the file is UTF16ed so we can't just "sed" it"

Comment 27

[(not reading, please use [e-mail] instead)]

see http://lxr.mozilla.org/mozilla1.8/source/browser/app/Makefile.in#319, where we rsync (but don't "sed", as asaf explained) the contents of the macbuild/Contents/Resources/English.lproj directory

Comment 28

[(not reading, please use [e-mail] instead)]

robert sent me a modified version of this utf16 file (where he replaced "Bon Echo" with "Firefox" using a utf16 friendly editor) and I rebuilt on the mac, and the problem is now fixed.

I'll attach a new screen shot.

Comment 29

[Robert Strong (they/them - no direct email)]

Attachment: binary plist file - checked in for beta 1

I got a verbal r+ from sspitzer and a verbal a+ from schrep to land this

Comment 30

[(not reading, please use [e-mail] instead)]

Attachment: screen shot from "my" official 20b1 (mac) build (after robert's fix)

Comment 31

[pal-moz]

Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1b1) Gecko/20060708 BonEcho/2.0b1 ID:2006070805

20060707 respin Nightly is named "Firefox",
20060708 Nightly is "Bon Echo".
Why? What Happenes?

Comment 32

[Axel Hecht [:Pike]]

The release tinderbox has ac_add_options --enable-official-branding, the nightly tinderbox does not.

That may be on purpose, though, I'm not sure if nightlies are supposed to have official branding on, and if the non-official nightly branding should be moved over from BonEcho to Firefox.

Comment 33

[Robert Strong (they/them - no direct email)]

Attachment: Trunk patch for consistency - checked in

Carrying forward sspitzer's r+

Comment 34

[Robert Strong (they/them - no direct email)]

Installer changes checked in to trunk. resolving -> fixed.

Comment 35

[Robert Strong (they/them - no direct email)]

Attachment: Rename back to Bon Echo for Mac OS X (1.8.1 branch only)

Comment 36

[(not reading, please use [e-mail] instead)]

Comment on attachment 229516 [details] [diff] [review]
Rename back to Bon Echo for Mac OS X (1.8.1 branch only)

r=sspitzer

Comment 37

[Robert Strong (they/them - no direct email)]

Comment on attachment 229516 [details] [diff] [review]
Rename back to Bon Echo for Mac OS X (1.8.1 branch only)

1.8.1 branch only - changes Firefox back to Bon Echo for Mac OS X's menubar

Comment 38

[Robert Strong (they/them - no direct email)]

Comment on attachment 229516 [details] [diff] [review]
Rename back to Bon Echo for Mac OS X (1.8.1 branch only)

No longer needed now that bug 343931 has been fixed