The default bug view has changed. See this FAQ.

Use a different wordmark and possibly other branding changes for Thunderbird 17 ESR

RESOLVED FIXED in Thunderbird 21.0

Status

Thunderbird
Build Config
RESOLVED FIXED
4 years ago
4 years ago

People

(Reporter: standard8, Assigned: standard8)

Tracking

Trunk
Thunderbird 21.0
Dependency tree / graph

Thunderbird Tracking Flags

(thunderbird20+ fixed, thunderbird-esr1718+ fixed)

Details

Attachments

(5 attachments, 2 obsolete attachments)

(Assignee)

Description

4 years ago
+++ This bug was initially created as a clone of Bug #721661 +++

We're going to adopt a wordmark for Thunderbird for the ESR releases - we need to port the work onto TB 17 ESR.
(Assignee)

Updated

4 years ago
Blocks: 796975
(Assignee)

Comment 1

4 years ago
Created attachment 682411 [details] [diff] [review]
Initial ESR fix

Okay, initially we're going to do this the same way as we do normal releases - use the existing mozconfigs and hence use the "offical" branding.

Once we get past the initial esr release, we'll switch to a separate branding directory which will deal with having ESR and mainstream on the same branch.

I'll do the patch for that later.
Attachment #682411 - Flags: review?(mconley)
(Assignee)

Comment 2

4 years ago
Oh, the preference changes are because we need to distinguish between ESR & non-ESR for the what's new and release notes and we can't do that via the version numbers now.
Comment on attachment 682411 [details] [diff] [review]
Initial ESR fix

Looks good to me.
Attachment #682411 - Flags: review?(mconley) → review+
(Assignee)

Comment 4

4 years ago
Comment on attachment 682411 [details] [diff] [review]
Initial ESR fix

[Triage Comment]
a=me for comm-esr17.
Attachment #682411 - Flags: approval-comm-esr17+
(Assignee)

Comment 5

4 years ago
Checked in: https://hg.mozilla.org/releases/comm-esr17/rev/1fb7584b4064

Leaving open to remember to do the follow-up changes.
Blocks: 815302
(Assignee)

Updated

4 years ago
tracking-thunderbird-esr17: --- → 18+
(Assignee)

Comment 6

4 years ago
Created attachment 696794 [details] [diff] [review]
Main rework for the branding

This patch adds the capability for an environment variable to modify the official branding options so that we're branding as ESR.

Doing it this way avoids the need for a separate directory which would adversely affect l10n (who would need to have two lots of the branded locale files).

This is a solution to land on esr17-only at the moment. I'm planning on revising some of the branding that we currently use before ESR 24.

Two more patches coming.
Attachment #696794 - Flags: review?(jhopkins)
(Assignee)

Comment 7

4 years ago
Created attachment 696795 [details] [diff] [review]
Revert the about dialog wordmark for release versions

This patch reverts the about-wordmark.png to what was there before attachment 682411 [details] [diff] [review] on this bug landed. This means we get that as the release wordmark. The esr one was created in the previous patch by copying this, and is called about-esr-wordmark.png.
Attachment #696795 - Flags: review?(jhopkins)
(Assignee)

Comment 8

4 years ago
Created attachment 696796 [details] [diff] [review]
Copy release mozconfigs for esr

This is the final patch we need - it copies the 'release' mozconfigs to 'esr' and adds the necessary environment variable for building as ESR.

I've tested the builds on my machine for both release and esr built from the same source with the different mozconfigs and it worked fine.
Attachment #696796 - Flags: review?(jhopkins)
Comment on attachment 696794 [details] [diff] [review]
Main rework for the branding

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

Just two notes.

::: mail/confvars.sh
@@ +43,5 @@
> +  ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-esr
> +  # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
> +  MAR_CHANNEL_ID=thunderbird-comm-esr
> +else
> +  MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird

Lines 39 and 47 execute regardless of $MOZ_ESR, so should be put outside of the conditional.

::: other-licenses/branding/thunderbird/Makefile.in
@@ +14,5 @@
>  	locales \
>  	$(NULL)
>  
> +ifdef MOZ_ESR
> +PREF_JS_EXPORTS = $(srcdir)/thunderbird-esr-branding.js

Where is thunderbird-esr-branding.js? I don't see it in any of your patches.
Attachment #696794 - Flags: review?(jhopkins)
Comment on attachment 696796 [details] [diff] [review]
Copy release mozconfigs for esr

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

Why do we need export for MOZ_DEBUG_SYMBOLS, but not for MOZ_ESR?
Attachment #696796 - Flags: review?(jhopkins)
Attachment #696795 - Flags: review?(jhopkins) → review+
(Assignee)

Comment 11

4 years ago
Created attachment 697144 [details] [diff] [review]
Copy mozconfigs for esr v2

Add the export.
Attachment #696796 - Attachment is obsolete: true
Attachment #697144 - Flags: review?(mconley)
Comment on attachment 697144 [details] [diff] [review]
Copy mozconfigs for esr v2

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

Great, thanks!
Attachment #697144 - Flags: review?(mconley) → review+
(Assignee)

Comment 13

4 years ago
(In reply to Mike Conley (:mconley) from comment #9)
> ::: other-licenses/branding/thunderbird/Makefile.in
> @@ +14,5 @@
> >  	locales \
> >  	$(NULL)
> >  
> > +ifdef MOZ_ESR
> > +PREF_JS_EXPORTS = $(srcdir)/thunderbird-esr-branding.js
> 
> Where is thunderbird-esr-branding.js? I don't see it in any of your patches.

It is a hg copy... might not show up in splinter.
(In reply to Mark Banner (:standard8) from comment #13)
> (In reply to Mike Conley (:mconley) from comment #9)
> > ::: other-licenses/branding/thunderbird/Makefile.in
> > @@ +14,5 @@
> > >  	locales \
> > >  	$(NULL)
> > >  
> > > +ifdef MOZ_ESR
> > > +PREF_JS_EXPORTS = $(srcdir)/thunderbird-esr-branding.js
> > 
> > Where is thunderbird-esr-branding.js? I don't see it in any of your patches.
> 
> It is a hg copy... might not show up in splinter.

Ah, you're right - I see the copy in the diff.
(Assignee)

Comment 15

4 years ago
Created attachment 697149 [details] [diff] [review]
Main rework for the branding v2

Updated confvars.sh. Note the thunderbird-esr-branding.js as per my previous comment.
Attachment #697149 - Flags: review?(mconley)
Comment on attachment 697149 [details] [diff] [review]
Main rework for the branding v2

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

Looks great. Thanks Mark!
Attachment #697149 - Flags: review?(mconley) → review+
(Assignee)

Updated

4 years ago
Attachment #696794 - Attachment is obsolete: true
(Assignee)

Comment 17

4 years ago
Comment on attachment 696795 [details] [diff] [review]
Revert the about dialog wordmark for release versions

[Triage Comment]
a=me for all of these simple build fixes.
Attachment #696795 - Flags: approval-comm-esr17+
(Assignee)

Updated

4 years ago
Attachment #697144 - Flags: approval-comm-esr17+
(Assignee)

Updated

4 years ago
Attachment #697149 - Flags: approval-comm-esr17+
(Assignee)

Comment 18

4 years ago
https://hg.mozilla.org/releases/comm-esr17/rev/6edb04be8059
https://hg.mozilla.org/releases/comm-esr17/rev/ae503020d67f
https://hg.mozilla.org/releases/comm-esr17/rev/b64dc927ed81
status-thunderbird-esr17: --- → fixed
(Assignee)

Updated

4 years ago
tracking-thunderbird20: --- → +
(Assignee)

Updated

4 years ago
Duplicate of this bug: 815607
(Assignee)

Updated

4 years ago
Duplicate of this bug: 815613
The mozconfig changes here caused us to fail some pre-release checks. In order to fix them, I added MOZ_ESR=1 to the comm-esr17 nightly mozconfigs, too. I don't know if that's the correct fix, so this may need changing later. https://hg.mozilla.org/releases/comm-esr17/rev/2afbc44b8134
(Assignee)

Updated

4 years ago
Blocks: 836036
(Assignee)

Updated

4 years ago
Depends on: 836041
(Assignee)

Comment 22

4 years ago
Created attachment 707850 [details] [diff] [review]
Fix ESR branding

This fixes the branding packaging so that we'll package the appropriate thunderbird-(esr-)branding.js depending on if we're ok or not.

I've tested this on local builds & packaging and it worked fine.

This should at least allow us to build esr off the new mozconfigs for the new branding.

The non-esr part is reliant on other bugs at the moment.
Attachment #707850 - Flags: review?(jhopkins)
Attachment #707850 - Flags: review?(jhopkins) → review+
(Assignee)

Comment 23

4 years ago
Comment on attachment 707850 [details] [diff] [review]
Fix ESR branding

[Triage Comment]
Need this for ESR 17 packaging.
Attachment #707850 - Flags: approval-comm-esr17+
(Assignee)

Comment 24

4 years ago
Comment on attachment 707850 [details] [diff] [review]
Fix ESR branding

Checked in:

https://hg.mozilla.org/releases/comm-esr17/rev/56b85911cf0b
(Assignee)

Comment 25

4 years ago
(In reply to Mark Banner (:standard8) from comment #24)
> Comment on attachment 707850 [details] [diff] [review]
> Fix ESR branding
> 
> Checked in:
> 
> https://hg.mozilla.org/releases/comm-esr17/rev/56b85911cf0b

I also had to backout the patch mentioned in comment 21 as unit tests were failing due to mis-matached mozconfigs & branding - we'll need to fix it properly in bug 836036.

https://hg.mozilla.org/releases/comm-esr17/rev/830f2f1e3a36
(Assignee)

Updated

4 years ago
Blocks: 838794
(Assignee)

Comment 26

4 years ago
This is fixed now, porting to trunk is going to be handled in bug 838794.
Status: NEW → RESOLVED
Last Resolved: 4 years ago
status-thunderbird20: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 21.0
You need to log in before you can comment on or make changes to this bug.