Closed Bug 1084578 Opened 10 years ago Closed 10 years ago

Building of l10n builds broken since modified file structure on OS X

Categories

(Firefox Build System :: General, defect)

x86
macOS
defect
Not set
normal

Tracking

(firefox33 unaffected, firefox34 affected, firefox35 affected, firefox36 affected)

RESOLVED FIXED
mozilla36
Tracking Status
firefox33 --- unaffected
firefox34 --- affected
firefox35 --- affected
firefox36 --- affected

People

(Reporter: Nomis101, Assigned: Nomis101)

References

Details

Attachments

(1 file, 1 obsolete file)

1.43 KB, patch
robert.strong.bugs
: review+
Details | Diff | Splinter Review
Attached patch l10n-patch.txt (obsolete) — Splinter Review
Since Bug 1047584 I get the following error if I build a localized Firefox build and try to pack this into the installer:

Error: /Volumes/Developer/comm-central/mozilla/obj-x86_64-apple-darwin14.0.0/browser/installer/package-manifest:26: Missing file(s): Firefox.app/Contents/Resources/en.lproj/*

Line 26 was added in Bug 1047584. The attached patch will fix this problem.
Attachment #8507154 - Flags: review?(benjamin)
Comment on attachment 8507154 [details] [diff] [review]
l10n-patch.txt

So, for en-US this should be en.lproj and unless I am mistaken this will make it en-US.lproj. I think this could be handled by just checking if @AB_CD@ is en-US and using @APPNAME@/Contents/Resources/en.lproj/* and otherwise use @APPNAME@/Contents/Resources/@AB_CD@.lproj/*
Comment on attachment 8507154 [details] [diff] [review]
l10n-patch.txt

This is going to need to use something like this instead
http://mxr.mozilla.org/mozilla-central/source/toolkit/locales/l10n.mk#35

I can take the review requests for this if you resubmit.
Comment on attachment 8507154 [details] [diff] [review]
l10n-patch.txt

Discussed this with Benjamin and I'll take the review request. If you can implement comment #2 this will likely be good to go. Thanks!
Attachment #8507154 - Flags: review?(benjamin) → review-
Please let me know if you will be able to resubmit an updated patch. Thanks!
Flags: needinfo?(Nomis101)
Hi Robert, today I will try to make a new patch, based on #2. Currently I'm trying to figure out in which file I have to put this line to define "AB". If I will be not able to resubmit a new patch today, I let you know.
Flags: needinfo?(Nomis101)
(In reply to Robert Strong [:rstrong] (use needinfo to contact me) from comment #4)
> Please let me know if you will be able to resubmit an updated patch. Thanks!

Sorry, I couldn't figure out how to implement #2. I've tried to define "AB" in the Makefile.in. But I only get an UNDEFINED_VAR error. Somebody other needs to make this patch.
Assignee: Nomis101 → nobody
(In reply to Nomis101 from comment #6)
> (In reply to Robert Strong [:rstrong] (use needinfo to contact me) from
> comment #4)
> > Please let me know if you will be able to resubmit an updated patch. Thanks!
> 
> Sorry, I couldn't figure out how to implement #2. I've tried to define "AB"
> in the Makefile.in. But I only get an UNDEFINED_VAR error. Somebody other
> needs to make this patch.

Oh wait, I think I now have a working patch. :-) Works with "en-US", will upload it in a minute, if it also works with "de".
Attached patch patch v2Splinter Review
I have tested this with "en-US" and "de".
Attachment #8507154 - Attachment is obsolete: true
Attachment #8507565 - Flags: review?(robert.strong.bugs)
Looks good! I'm going to also verify locally before r+'ing the patch and should be done in a couple of hour.
Comment on attachment 8507565 [details] [diff] [review]
patch v2

Works for me and thanks!
Attachment #8507565 - Flags: review?(robert.strong.bugs) → review+
Assignee: nobody → Nomis101
Status: NEW → ASSIGNED
Since the message needs to be updated I'lll and this
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/454a135ffc9c
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: