Closed Bug 1324045 Opened 3 years ago Closed 3 years ago
Move locale search plugin XML files into a centralized path
Not sure if this is more a Search Activity or a Build Config bug, leaving in the same component as bug 1300201 for now. Once bug 1300201 lands, we need to consolidate shipping searchplugins into a centralized path like it happened for desktop.
There were very few problems with mobile. Two license issues (amazon-en-GB, amazon-de). And we have the same wikipedia-br problem as desktop (pt-BR using wikipedia-br with pt content) So this should be pretty easy.
Some notes: 1. amazon-co-uk and amazon-en-GB were the same, so I removed amazon-en-GB. 2. amazon-fr and amazon-france were basically the same so I removed amazon-france 3. Fixed the pt/br issues to match desktop I grabbed my engines from l10n-aurora.
I have a couple of question before trying to check all files: 1. Shouldn't you be moving also en-US searchplugins from locales/en-US/searchplugins into locales/searchplugins? 2. Aren't we missing a build step to pick searchplugins from this folder for the build? Or is this bug just about consolidating l10n XML files before looking at the build system?
My bad. Forgot the rest of the patch. It's up now.
Comment on attachment 8852657 [details] Bug 1324045 - Move mobile searchplugins into mozilla-central. https://reviewboard.mozilla.org/r/124842/#review128006 A few files have a weird 755 permission, you should probably fix them. baidu.xml faclair-beag.xml wikipedia-sq.xml wikipedia-th.xml wikipedia-zh-CN.xml wiktionary-ta.xml Besides these notes, I can't spot anything wrong with this. ::: mobile/locales/searchplugins/tut.by.xml:1 (Diff revision 2) > +<!-- This Source Code Form is subject to the terms of the Mozilla Public Remove this file, not used anymore by Belarusian
Attachment #8852657 - Flags: review?(francesco.lodolo) → review+
Pushed by firstname.lastname@example.org: https://hg.mozilla.org/integration/autoland/rev/f6bba83342c4 Move mobile searchplugins into mozilla-central. r=flod
Backed out for breaking Android nightlies or multilocale builds in general: https://hg.mozilla.org/mozilla-central/rev/896992d97d7c684b8eac6bf576e72d032f86b18b Push with failures: https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=7a3f514cf8490d271ee373a1d2999e4ea4dee2d7&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-resultStatus=retry&filter-resultStatus=usercancel&filter-resultStatus=runnable Failure log: https://treeherder.mozilla.org/logviewer.html#?job_id=88137824&repo=mozilla-central [task 2017-04-02T10:44:59.381718Z] 10:44:59 INFO - 10:44:59 INFO - ERROR: The following duplicated files are not allowed: [task 2017-04-02T10:44:59.381907Z] 10:44:59 INFO - 10:44:59 INFO - chrome/pt-BR/locale/pt-BR/browser/searchplugins/wikipedia-pt.xml [task 2017-04-02T10:44:59.382095Z] 10:44:59 INFO - 10:44:59 INFO - chrome/pt-PT/locale/pt-PT/browser/searchplugins/wikipedia-pt.xml [task 2017-04-02T10:44:59.382309Z] 10:44:59 INFO - 10:44:59 INFO - /home/worker/workspace/build/src/toolkit/mozapps/installer/packager.mk:41: recipe for target 'stage-package' failed [task 2017-04-02T10:44:59.382475Z] 10:44:59 INFO - 10:44:59 ERROR - make: *** [stage-package] Error 1 [task 2017-04-02T10:44:59.382700Z] 10:44:59 INFO - 10:44:59 INFO - make: Leaving directory '/home/worker/workspace/build/src/obj-firefox/mobile/android/installer' [task 2017-04-02T10:44:59.382909Z] 10:44:59 INFO - 10:44:59 INFO - /home/worker/workspace/build/src/toolkit/mozapps/installer/packager.mk:101: recipe for target 'make-package' failed [task 2017-04-02T10:44:59.383075Z] 10:44:59 INFO - 10:44:59 ERROR - make: *** [make-package] Error 2 [task 2017-04-02T10:44:59.383285Z] 10:44:59 INFO - 10:44:59 INFO - make: Leaving directory '/home/worker/workspace/build/src/obj-firefox/mobile/android/installer' [task 2017-04-02T10:44:59.383481Z] 10:44:59 INFO - 10:44:59 INFO - /home/worker/workspace/build/src/config/rules.mk:519: recipe for target 'default' failed [task 2017-04-02T10:44:59.383645Z] 10:44:59 INFO - 10:44:59 ERROR - make: *** [default] Error 2 [task 2017-04-02T10:44:59.383855Z] 10:44:59 INFO - 10:44:59 INFO - make: Leaving directory '/home/worker/workspace/build/src/obj-firefox/mobile/android/installer' [task 2017-04-02T10:44:59.384053Z] 10:44:59 INFO - 10:44:59 INFO - /home/worker/workspace/build/src/mobile/android/build.mk:11: recipe for target 'package' failed [task 2017-04-02T10:44:59.384219Z] 10:44:59 INFO - 10:44:59 INFO - make: *** [package] Error 2 [task 2017-04-02T10:44:59.384396Z] 10:44:59 INFO - 10:44:59 ERROR - Return code: 2
So wikipedia-pt will need to be added to this list https://dxr.mozilla.org/mozilla-central/source/mobile/android/installer/allowed-dupes.mn Possibly others. Is there any way to do a try mulyilocale build? Or maybe I should put all the searchplugins in one location and avoid suplication completely?
I think the latter (actually de-duping) would be great. apk-size wins ftw.
Pushed by email@example.com: https://hg.mozilla.org/mozilla-central/rev/a7baa6f3c013 Move mobile searchplugins into mozilla-central. r=flod reland because fennec nightlies have a different bustage with this backed out https://hg.mozilla.org/mozilla-central/rev/ca7ae8119796 Move mobile searchplugins into mozilla-central. Whitelist wikipedia-pt.xml to fix fennec nightlies. r=bustage-fix a=bustage-fix
Relanded the patch: https://hg.mozilla.org/mozilla-central/rev/a7baa6f3c013ceabcc3a0bae7cfb129c7885e34f Whitelisted the search engine: https://hg.mozilla.org/mozilla-central/rev/ca7ae811979699ebda2f1c3984ebd92b7cf4b51b
Sorry for contributing to the mess, I confess I had no idea that a missing searchplugin in the localization repository would bust the build (I removed them from /it). And I think we need to clean this file up at this point https://hg.mozilla.org/mozilla-central/file/ca7ae8119796/mobile/android/installer/allowed-dupes.mn * 'amazon-en-GB doesn't exist anymore * Not sure why 'bolcom-fy-NL' and 'bolcom-nl' were listed in the first place (from bug 1317313)
Status: REOPENED → RESOLVED
Closed: 3 years ago → 3 years ago
Resolution: --- → FIXED
Mike, as we added all locales on central, we got more packaging errors: [task 2017-04-06T22:09:45.841261Z] 22:09:45 INFO - 22:09:45 INFO - ERROR: The following duplicated files are not allowed: [task 2017-04-06T22:09:45.841447Z] 22:09:45 INFO - 22:09:45 INFO - chrome/hi-IN/locale/hi-IN/browser/searchplugins/list.json [task 2017-04-06T22:09:45.841630Z] 22:09:45 INFO - 22:09:45 INFO - chrome/mai/locale/mai/browser/searchplugins/list.json [task 2017-04-06T22:09:45.841815Z] 22:09:45 INFO - 22:09:45 INFO - chrome/ff/locale/ff/browser/searchplugins/amazon-fr.xml [task 2017-04-06T22:09:45.841999Z] 22:09:45 INFO - 22:09:45 INFO - chrome/son/locale/son/browser/searchplugins/amazon-fr.xml Can you add those to the ignore dupes, and possibly get the nightly respun? We're looking for fully localized nightlies quickly for the dawn.
I'll take care of this in 1 hour. The list.json shouldn't happen usually though. Do those locales not have unique wikipedia entries?
Maithili references the Hindi wikipedia. Origin is probably bug 560480 comment 1, on desktop back in the days, and the ported over to mobile. Not sure if that's still a good choice, maybe flod wants to drill in to the wikipedia stats on article counts etc. Fuchsia:mozilla-aurora axelhecht$ cat hi-IN/mobile/searchplugins/list.txt amazon-in bing google twitter wikipedia-hi yahoo-in Fuchsia:mozilla-aurora axelhecht$ cat mai/mobile/searchplugins/list.txt amazon-in bing google twitter wikipedia-hi yahoo-in Fuchsia:mozilla-aurora axelhecht$
Pushed by firstname.lastname@example.org: https://hg.mozilla.org/mozilla-central/rev/fe8820982116 Workaround duplicate search files. r=aki, a=release
You need to log in before you can comment on or make changes to this bug.