1422997 - multilocale.json not packaged in repack builds

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Zibi Braniecki [:zbraniecki][:gandalf]]

Repackaged builds are missing omni.ja!/res/multilocale.json.

It's a new regression in 59, 58b9 works well.

Comment 1

[Axel Hecht [:Pike]]

This is a regression from https://hg.mozilla.org/mozilla-central/rev/0abbf75bd0ec#l3.78, bug 1385227.

The langpack-% target doesn't get called during repacks anymore, and thus the invocation doesn't happen.

Should move the multilocale.json-$(AB_CD) into libs-%.

Comment 2

[Zibi Braniecki [:zbraniecki][:gandalf]]

Attachment: Bug 1422997 - Fix multilocale.json in repacks.

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

Comment 3

[Zibi Braniecki [:zbraniecki][:gandalf]]

try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=09480a29519cf6d91f4e4fff9c7206bbe51d7f50

Comment 4

[Axel Hecht [:Pike]]

Comment on attachment 8934345 [details]
Bug 1422997 - Fix multilocale.json in repacks.

https://reviewboard.mozilla.org/r/205286/#review210966

This is almost an r=me with nits, but with l10n, I'd rather see us doing another patch and try run, just to be safe.

I tested the generated target.tar.bz2, and the res/multilocale.json is in omni.ja, and has ["de", "en-US"] for the German package. Compared with Nightly, where that file isn't in that omni.ja.

::: toolkit/mozapps/installer/packager.mk:213
(Diff revision 1)
>  multilocale.json:
>  	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
>  
>  # This version of the target uses AB_CD to build multilocale.json and places it
>  # in the $(XPI_NAME)/res dir - it should be used when repackaging a build.
> +multilocale.json-%: XPI_NAME=locale-$*

Please put the XPI_NAME into the call sites in browser and mobile/android.

Comment 5

[Zibi Braniecki [:zbraniecki][:gandalf]]

Comment on attachment 8934345 [details]
Bug 1422997 - Fix multilocale.json in repacks.

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

Comment 6

[Zibi Braniecki [:zbraniecki][:gandalf]]

New try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=9baa1c8333821b971473100023418a90ae85aa91

Comment 7

[Axel Hecht [:Pike]]

Comment on attachment 8934345 [details]
Bug 1422997 - Fix multilocale.json in repacks.

https://reviewboard.mozilla.org/r/205286/#review211112

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6ad22920c166
Fix multilocale.json in repacks. r=Pike

Comment 9

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/6ad22920c166