l10n repacks need the makefile in mobile/locales

VERIFIED FIXED in Firefox 11

Status

()

Firefox for Android
General
VERIFIED FIXED
6 years ago
6 years ago

People

(Reporter: Pike, Assigned: Pike)

Tracking

unspecified
Firefox 12
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(firefox11 fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

6 years ago
Missed this when doing bug 708015, the Makefile in mobile/locales is currently only done when building from mobile/android or /xul, per DIRS.

It's not there when you start your journey in mobile/android/locales.

Do what branding does is the way to go.
(Assignee)

Comment 1

6 years ago
Created attachment 587270 [details] [diff] [review]
generate mobile/locales/Makefile

This makes sure that the mobile/locales/Makefile is created, by both configure and the Makefile logic in mobile/*/locales/Makefile.in.

Trivial patch, also pushed to try at https://tbpl.mozilla.org/?tree=Try&rev=a69a530db418 with a minimal build set.
Attachment #587270 - Flags: review?(aki)

Comment 2

6 years ago
Hm, I'm getting

 extracting: omni.ja                 
  inflating: classes.dex             
mv: cannot stat `lib/armeabi-v7a/libmozglue.so': No such file or directory
make: *** [/builds/slave/m-cen-andrd-l10n-1/mozilla-central/obj-l10n/mobile/android/locales/../../../dist/l10n-stage/fennec] Error 1
command: END (0.39s elapsed)

Traceback (most recent call last):
  File "/builds/slave/m-cen-andrd-l10n-1/scripts/scripts/l10n/nightly-mobile-repacks.py", line 191, in <module>
    options.platform, stage_platform, mobileDirName, en_us_binary_url)
  File "/builds/slave/m-cen-andrd-l10n-1/scripts/scripts/l10n/nightly-mobile-repacks.py", line 51, in createRepacks
    buildInfo = downloadNightlyBuild(localeSrcDir, env)
  File "/builds/slave/m-cen-andrd-l10n-1/scripts/scripts/l10n/../../lib/python/build/download.py", line 8, in downloadNightlyBuild
    run_cmd(["make", "unpack"], cwd=localeSrcDir, env=env)
  File "/builds/slave/m-cen-andrd-l10n-1/scripts/scripts/l10n/../../lib/python/util/commands.py", line 42, in run_cmd
    return subprocess.check_call(cmd, **kwargs)
  File "/tools/python-2.5.1/lib/python2.5/subprocess.py", line 461, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['make', 'unpack']' returned non-zero exit status 2

I currently suspect http://hg.mozilla.org/mozilla-central/rev/c899dde43144 .

Comment 3

6 years ago
[11:11]	<glandium>	aki: it suggests you're using a packager.mk that is newer than the build you're using it on

Building a new nightly to test on.
(Assignee)

Comment 4

6 years ago
Yeah, http://hg.mozilla.org/mozilla-central/diff/cf890c9c3e4c/toolkit/mozapps/installer/packager.mk looks OK as long as your build and your tree are on the same side of the tree.

Comment 5

6 years ago
Comment on attachment 587270 [details] [diff] [review]
generate mobile/locales/Makefile

I have android l10n jobs going green now (with this patch), thanks!
There are some that are broken, but those look like locales that need updating (

    raise RuntimeError('File "%s" not found in %s' % (src, ', '.join(src_base)))
RuntimeError: File "wikipedia-he.xml" not found in /builds/slave/m-cen-andrd-l10n-3/mozilla-central/mobile/locales/en-US/searchplugins, /builds/slave/m-cen-andrd-l10n-3/l10n-central/he/mobile/searchplugins, /builds/slave/m-cen-andrd-l10n-3/mozilla-central/obj-l10n/mobile/locales, /builds/slave/m-cen-andrd-l10n-3/mozilla-central/obj-l10n/mobile/locales
make[3]: *** [searchplugins] Error 1

)

Shipit!
Attachment #587270 - Flags: review?(aki) → review+
(Assignee)

Comment 6

6 years ago
https://hg.mozilla.org/mozilla-central/rev/fee66b45f486, marking FIXED.
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED

Updated

6 years ago
Target Milestone: --- → Firefox 12
(Assignee)

Comment 7

6 years ago
Comment on attachment 587270 [details] [diff] [review]
generate mobile/locales/Makefile

[Approval Request Comment]
Regression caused by (bug #): 
User impact if declined: no fennec l10n builds for 11
Testing completed (on m-c, etc.): it built, aki's doing the release integration of this and gave the r+
Risk to taking this patch (and alternatives if risky): no risk really, just creating more makefiles early in the build run
Attachment #587270 - Flags: approval-mozilla-aurora?

Comment 8

6 years ago
Comment on attachment 587270 [details] [diff] [review]
generate mobile/locales/Makefile

[Triage Comment]
Approved for Aurora to get fennec l10n builds.
Attachment #587270 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
(Assignee)

Comment 9

6 years ago
https://hg.mozilla.org/releases/mozilla-aurora/rev/c0633c711e80, fixed for 11.
status-firefox11: --- → fixed
Verified fixed on:

Mozilla/5.0 (Android;Linux armv7l;rv:11.0a2)Gecko/20120130
Firefox/11.0a2 Fennec/11.0a2
Device: Samsung Galaxy S
OS: Android 2.2

Mozilla/5.0 (Android;Linux armv7l;rv:12.0a1)Gecko/20120130
Firefox/12.0a1 Fennec/12.0a1
Device: Samsung Galaxy S
OS: Android 2.2
Status: RESOLVED → VERIFIED
You need to log in before you can comment on or make changes to this bug.