1468240 - Thunderbird Dailies l10n busted as of 2018-06-09

Status: RESOLVED FIXED

(Thunderbird :: Search, enhancement)

Description

[Jorg K (CEST = GMT+2)]

Tom told me in a PM that this is due to bug 1437942.

Michael, can you please tell me what we need to to since
https://hg.mozilla.org/mozilla-central/rev/67f15f445506
is huge.

Comment 1

[Mike Kaply [:mkaply]]

I tried to write that patch specifically do it wouldn't break Thunderbird. Can I get the build log?

Comment 2

[Jorg K (CEST = GMT+2)]

https://treeherder.mozilla.org/#/jobs?repo=comm-central&revision=5ee92a30a3f4a0242c238249b1a2ecef4935db37
and then click on any of the red "Nx" and look at the log.

For example:
https://taskcluster-artifacts.net/Jb1wj5BBTPO2iuFNb8C08g/0/public/logs/live_backing.log

There we see:
Error: Missing file: ../../../dist/xpi-stage/locale-be/chrome/be/locale/be/messenger/searchplugins/amazondotcom.xml

And later:
ERROR - failure: repack_locale(be)

Comment 3

[Mike Kaply [:mkaply]]

So the problem is:

https://dxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/l10n-repack.py

Thunderbird still needs the line:

'chrome/**/searchplugins/*.xml',

in NON_CHROME because the searchplugins are still in the langpacks.

buildconfig is imported into this file.

Is there some way to do a Thunderbird check and add that line to NON_CHROME?

Comment 4

[Jorg K (CEST = GMT+2)]

(In reply to Mike Kaply [:mkaply] from comment #3)
> Is there some way to do a Thunderbird check and add that line to NON_CHROME?
Question for Tom?

Comment 5

[Jorg K (CEST = GMT+2)]

From IRC:
23:30:38 - tomprince: jorgk: my inclination is to suggest porting the changes, rather than figuring out how to keep TB working the way it does now.

Comment 6

[Mike Kaply [:mkaply]]

Basically you need to move all search engines from the locales into the tree.

The build process itself is much simpler.

I'll see if I can do a patch.

Comment 7

[Jorg K (CEST = GMT+2)]

(In reply to Mike Kaply [:mkaply] from comment #6)
> Basically you need to move all search engines from the locales into the tree.
Yes, you did, for example:
rename from browser/locales/searchplugins/ebay-au.xml
rename to browser/components/search/searchplugins/ebay-au.xml

Looking in our tree, we don't have mail/locales/searchplugins/, all we have is mail/locales/en-US/searchplugins with a few XML files.

Comment 8

[Mike Kaply [:mkaply]]

Attachment: First pass

Here's my first pass at this change. It's still not building locally, but I think it's my tree.

It moves the plugins into mail/components/search.

Comment 9

[Jorg K (CEST = GMT+2)]

Please let me know if you want a try build.

Comment 10

[Mike Kaply [:mkaply]]

I verified that this patch fixes the build problem.

In addition to this step, all search XML files from the mail directories here:

https://dxr.mozilla.org/l10n-central/search?q=file%3A*.xml&redirect=false

Should be moved into mail/components/search/searchplugins and removed from the l10n tree.

All search engines are now maintained in the main tree instead of langpacks.

Comment 11

[Jorg K (CEST = GMT+2)]

Comment on attachment 8985225 [details] [diff] [review]
First pass

(In reply to Mike Kaply [:mkaply] from comment #10)
> I verified that this patch fixes the build problem.
Thanks Mike, I'll get this landed.

> In addition to this step, all search XML files from the mail directories
> here:
> https://dxr.mozilla.org/l10n-central/search?q=file%3A*.xml&redirect=false
> Should be moved into mail/components/search/searchplugins and removed from
> the l10n tree.
That's 216 files. I'll file a follow-up for this.

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/33551f4516d0
Move searchplugins to mail directory. rs=jorgk DONTBUILD

Comment 13

[Jorg K (CEST = GMT+2)]

Landed with DONTBUILD, I'll check the Daily run in a few hours. I filed bug 1468686 for the follow-up.

BIG THANK YOU again, Mike!!

Comment 14

[Jorg K (CEST = GMT+2)]

Wow, that worked \o/ - Thanks again.