Unofficial branding for Fennec

RESOLVED FIXED in Firefox 6

Status

Firefox for Android Graveyard
General
RESOLVED FIXED
7 years ago
7 years ago

People

(Reporter: mbrubeck, Assigned: mbrubeck)

Tracking

Trunk
Firefox 6

Details

Attachments

(2 attachments, 3 obsolete attachments)

(Assignee)

Description

7 years ago
Created attachment 532776 [details] [diff] [review]
patch

Unofficial Fennec builds (e.g. tryserver or local builds) currently use the "Nightly" branding and package configuration.  This causes problems:

1) It's confusing, because these are not nightly builds.
2) Can't install a local build and a Nightly build at the same time (same package name).
3) Can't install a local build and Aurora at the same time (same sharedUserId but different signing keys).
4) Can't switch from a local build to a Nightly build or vice-versa without uninstalling and losing your profile (same package name but different signing keys).

Problems 3 and 4 can be partly solved by re-signing all Nightly and Aurora builds with your local debug key, but this adds a manual step to installation and does not work with the auto-updater.

The attached patch solves all of these problems by adding an "unofficial" branding directory for local builds.  The unofficial branding uses the "Fennec" name and icon, and a new "fennec_unofficial" package name and shared ID on Android.

This changes the default branding to "unofficial", so we will also need to modify the nightly mozconfigs to specify nightly branding.
(Assignee)

Comment 1

7 years ago
Created attachment 532800 [details] [diff] [review]
patch v2

Fixed some copy/paste bugs, and verified that this 

The sharedUserId bit is kind of ugly.  An approach like attachment 530787 [details] [diff] [review] from bug 655427 could be less hacky but more intrusive; we previously rejected that because we see sharedUserId only as a short-term solution for a few automation tools.
Assignee: nobody → mbrubeck
Attachment #532776 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #532800 - Flags: review?(mark.finkle)
Attachment #532800 - Flags: review?(blassey.bugs)
(Assignee)

Comment 2

7 years ago
(In reply to comment #1)
> Fixed some copy/paste bugs, and verified that this 

...can install alongside signed Nightly and Aurora builds.
Comment on attachment 532800 [details] [diff] [review]
patch v2

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

looks fine, but we'd need rel eng mozconfig changes to land at the same time

::: embedding/android/Makefile.in
@@ +107,5 @@
>  endif
>  else
>  ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png
>  ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png
> +DEFINES += -DMOZ_ANDROID_SHARED_ID=$(ANDROID_PACKAGE_NAME)".sharedID"

that's broken, just don't change this line

::: mobile/branding/unofficial/locales/Makefile.in
@@ +18,5 @@
> +# Portions created by the Initial Developer are Copyright (C) 2004
> +# the Initial Developer. All Rights Reserved.
> +#
> +# Contributor(s):
> +#

stick your name in here. Also, copyright should be 2011
(Assignee)

Comment 4

7 years ago
Created attachment 533002 [details] [diff] [review]
patch v3

(In reply to comment #3)
> > +DEFINES += -DMOZ_ANDROID_SHARED_ID=$(ANDROID_PACKAGE_NAME)".sharedID"
> 
> that's broken, just don't change this line

Oops, changed this by accident.  Fixed.

> > +# Portions created by the Initial Developer are Copyright (C) 2004
> > +# the Initial Developer. All Rights Reserved.
> > +#
> > +# Contributor(s):
> 
> stick your name in here. Also, copyright should be 2011

Done.
Attachment #532800 - Attachment is obsolete: true
Attachment #532800 - Flags: review?(mark.finkle)
Attachment #532800 - Flags: review?(blassey.bugs)
Attachment #533002 - Flags: review?(mark.finkle)
(Assignee)

Comment 5

7 years ago
Created attachment 533003 [details] [diff] [review]
mozconfig changes
Attachment #533003 - Flags: review?(aki)
(Assignee)

Comment 6

7 years ago
Created attachment 533005 [details] [diff] [review]
mozconfig changes v2

Aki pointed out on IRC that we should use the unofficial ("Fennec") branding for mobile desktop builds.
Attachment #533003 - Attachment is obsolete: true
Attachment #533003 - Flags: review?(aki)
(Assignee)

Updated

7 years ago
Attachment #533005 - Flags: review?(aki)

Updated

7 years ago
Attachment #533005 - Flags: review?(aki) → review+
Comment on attachment 533002 [details] [diff] [review]
patch v3

Let's not land this until the mozconfig changes are in place.
Attachment #533002 - Flags: review?(mark.finkle) → review+

Comment 8

7 years ago
Comment on attachment 533005 [details] [diff] [review]
mozconfig changes v2

http://hg.mozilla.org/build/buildbot-configs/rev/3ab0ebc576ad
This will be merged in by Thursday.  If needed earlier, let us know.
(Assignee)

Updated

7 years ago
Status: ASSIGNED → RESOLVED
Last Resolved: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 6
You need to log in before you can comment on or make changes to this bug.