1382005 - Update in-tree version of compare-locales to 2.1

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement, P1)

Description

[Axel Hecht [:Pike]]

+++ This bug was initially created as a clone of Bug #1344782 +++

Let's update to compare-locales 2.0

Comment 1

[Axel Hecht [:Pike]]

Attachment: bug 1382005, vendor new dependency for compare-locales, python-fluent,

This is the 0.4.2 release of python-fluent.

Review commit: https://reviewboard.mozilla.org/r/181296/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/181296/

Comment 2

[Axel Hecht [:Pike]]

Attachment: bug 1382005, update compare-locales to 2.1,

Review commit: https://reviewboard.mozilla.org/r/181298/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/181298/

Comment 3

[Axel Hecht [:Pike]]

Attachment: bug 1382005, make mach command a bare minimum wrapper,

The compare-locales mach command used to own a couple of defaults
and opinions.
Now that those opinions and defaults are in the Makefiles, this
command can be much simpler. As a side effect, this should
make the thunderbird port easier, where none of the mach defaults
worked.

Review commit: https://reviewboard.mozilla.org/r/181300/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/181300/

Comment 4

[Axel Hecht [:Pike]]

Attachment: bug 1382005, update compare-locales to 2.1,

The command line interface is different now, with positional arguments.
Also, the l10n config file isn't a default anymore (that never worked
for thunderbird).
And the merge dir is now the parent of the locale dir, much like
we already anticipated in the code.

Review commit: https://reviewboard.mozilla.org/r/181302/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/181302/

Comment 5

[Axel Hecht [:Pike]]

Splitting the review between libraries and build, stas for the former, glandium for the latter.

This is green on try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=be64f34bf2e5f09dd6f2c65c499ed496df3979d3

The build changes are really mostly removal and then just adding the shims to make the upstream compare-locales command logic work. I'm just a bit torn on keeping the mach command. I like that people that know the details can still run the in-tree compare-locales code. OTH, with the build owning the process now, this could also be a py_action. Maybe in a different bug, if that's a good idea.

I wish it'd be easy to call py_actions from the command line, ./mach python -m mozbuild.action.foo is quite a mouthful.

Comment 6

[Staś Małolepszy :stas]

Comment on attachment 8909805 [details]
bug 1382005, vendor new dependency for compare-locales, python-fluent,

https://reviewboard.mozilla.org/r/181296/#review186594

Comment 7

[Staś Małolepszy :stas]

Comment on attachment 8909806 [details]
bug 1382005, update compare-locales to 2.1,

https://reviewboard.mozilla.org/r/181298/#review186608

Comment 8

[Axel Hecht [:Pike]]

Moving over to build config, as that's mostly what this bug is about.

Comment 9

[Mike Hommey [:glandium]]

Comment on attachment 8909807 [details]
bug 1382005, make mach command a bare minimum wrapper,

https://reviewboard.mozilla.org/r/181300/#review187416

Comment 10

[Mike Hommey [:glandium]]

Comment on attachment 8909808 [details]
bug 1382005, update compare-locales to 2.1,

https://reviewboard.mozilla.org/r/181302/#review187418

::: toolkit/locales/l10n.mk:208
(Diff revision 1)
>  		$(NSINSTALL) -D $(L10NBASEDIR) ; \
>  		$(L10N_CO) ; \
>  	fi
>  endif
>  	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
> -	$(MOZILLA_DIR)/mach compare-locales --l10n-base $(L10NBASEDIR) --merge-dir $(REAL_LOCALE_MERGEDIR) $*
> +	$(MOZILLA_DIR)/mach compare-locales --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*

These 4 patches should all be folded into one. Because the state of the tree is essentially broken after the first patch and until this last one.

Comment 11

[Axel Hecht [:Pike]]

Comment on attachment 8909808 [details]
bug 1382005, update compare-locales to 2.1,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/181302/diff/1-2/

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c6d94140d11b
update compare-locales to 2.1, r=glandium

Comment 13

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/c6d94140d11b