1153327 - Run compare-locales with merging for Lightning

Status: RESOLVED FIXED

(Calendar :: Build Config, defect)

Description

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Right now we require all locales to be complete, it would be better to use l10n-merge/compare-locales to fall back to English strings.

This is also preparation for l10n-repacks to work, hence I needed to make the ABI flag lowercase.

Comment 1

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Pushed to comm-central changeset 9aa843cbd62d

Comment 2

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

argh, sorry. That was a try push.

Comment 3

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Attachment: Fix - v1

Comment 4

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=bf900d36093f

Comment 5

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8590953 [details] [diff] [review]
Fix - v1

Taking back review for now, still errors with unification *sigh*. We might just have to dump this in once there is a green try build and see how it goes for the beta.

Comment 6

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8590953 [details] [diff] [review]
Fix - v1

This one is good to go, green(ish) try run here, requires bug 1153790. Should be landed together with bug 1130854.

https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=da24c38fc3b5

Comment 7

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8590953 [details] [diff] [review]
Fix - v1

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

This is non-trivial changes to l10n repack code, which is a part of the build system that I'm quite frankly not competent to review.

Comment 8

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

There is not really a lot of magic to it. All I am changing here is running compare-locales for Lightning from within the build process (because we can't hook it into mozharness) and making sure LOCALE_MERGEDIR is set when running the Lightning targets. This adds --locale-mergedir=$(LOCALE_MERGEDIR) to the jar packager and therefore locale files are packed with merged English strings (http://mxr.mozilla.org/comm-central/source/mozilla/config/config.mk#572)

The remaining changes are just to make the build system and packagers happy as well as some cleanup: Some part of the packager fails because we had ABI uppercase instead of lower case. Also, I don't know why it worked before, the original practice of putting multiple pattern rules on the left side of the rule does something different and I needed to fix it to have the targets called correctly.

I don't really mind who reviews it, but I'd appreciate if we could get this in soon (Monday/Tuesday?) so it can be part of beta 3. Joshua, to take some burden from glandium who has already been putting up with enough of my patches lately, maybe you want to reconsider?

Comment 9

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

https://hg.mozilla.org/comm-central/rev/ef637a8bfda8
https://hg.mozilla.org/releases/comm-aurora/rev/80b2e529627d
https://hg.mozilla.org/releases/comm-beta/rev/07cacd85ba5d