Closed Bug 1422997 Opened 4 years ago Closed 4 years ago

multilocale.json not packaged in repack builds

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox59 fixed)

RESOLVED FIXED
mozilla59
Tracking Status
firefox59 --- fixed

People

(Reporter: zbraniecki, Assigned: Pike)

References

Details

Attachments

(1 file)

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

It's a new regression in 59, 58b9 works well.
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-%.
Assignee: nobody → l10n
Depends on: 1385227
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.
Attachment #8934345 - Flags: review?(l10n) → review-
Comment on attachment 8934345 [details]
Bug 1422997 - Fix multilocale.json in repacks.

https://reviewboard.mozilla.org/r/205286/#review211112
Attachment #8934345 - Flags: review?(l10n) → review+
Pushed by axel@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/6ad22920c166
Fix multilocale.json in repacks. r=Pike
https://hg.mozilla.org/mozilla-central/rev/6ad22920c166
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla59
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.