519686 - Build localized bookmarks data for multi-locale builds and use it

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Bookmarks, defect)

Description

[Axel Hecht [:Pike]]

We intend to ship a multi-locale build on maemo, and the default bookmarks should be boot-strapped with the right localizations.

We need to package that data in the chrome-% target of bug 519682, and then use it.

Comment 1

[:Gavin Sharp [email: [e-mail]]]

Attachment: patch

Packages the default bookmarks in the locale jar, and loads them from there.

Comment 2

[:Gavin Sharp [email: [e-mail]]]

Attachment: updated patch

Need to use libs realchrome rather than export.

Comment 3

[:Gavin Sharp [email: [e-mail]]]

Patch works as expected on the n810 (built multi-locale with es-ES, switched my device locale to "Espanol - Espana", got spanish UI/bookmarks on first run).

Comment 4

[Axel Hecht [:Pike]]

Comment on attachment 406527 [details] [diff] [review]
updated patch

r=me, thanks.

Comment 5

[:Gavin Sharp [email: [e-mail]]]

https://hg.mozilla.org/mobile-browser/rev/6bc1a3d1a1ee

Comment 6

[:Gavin Sharp [email: [e-mail]]]

backed out due to burning... will have to revisit tomorrow.

Comment 7

[:Gavin Sharp [email: [e-mail]]]

Attachment: bustage fix?

Burning was caused by jar packaging and my rule are both using the same target, and mine came after the inclusion of rules.mk (so we were generating the file after trying to package it).

This fixes it be moving it back to export, and running export from the chrome-% target... I have no idea if there are bad side effects to doing this.

Comment 8

[Axel Hecht [:Pike]]

Comment on attachment 406625 [details] [diff] [review]
bustage fix?

I guess this doesn't regenerate the bookmarks.json for each locale, I think you'll need something more like

> # Tailored target to just add the chrome processing for multi-locale builds
> chrome-%:
> 	@$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$*
>+	@$(MAKE) export AB_CD=$*
	@$(MAKE) -B bookmarks.json AB_CD=$*
> 	@$(MAKE) chrome AB_CD=$*
> 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
> 

I hope that the -B and the explicit call on bookmarks.json get make to ignore that it has the file, and regenerate it per force, as make --help says. Please verify that?

Comment 9

[:Gavin Sharp [email: [e-mail]]]

Attachment: better bustage fix

Yep, that works, and ted confirmed -B exists in 3.80 in case that's an issue.

Comment 10

[Axel Hecht [:Pike]]

Comment on attachment 406704 [details] [diff] [review]
better bustage fix

Now I think you broke the regular build. You'll need to keep the 

export:: bookmarks.json

for those. r=me with that fixed.

Comment 11

[:Gavin Sharp [email: [e-mail]]]

Attachment: rollup patch

Comment 12

[:Gavin Sharp [email: [e-mail]]]

https://hg.mozilla.org/mobile-browser/rev/08e1a8f1201f