Closed Bug 587984 Opened 14 years ago Closed 14 years ago

Toolkit's l10n.mk can't be included from comm-central

Categories

(Firefox Build System :: General, defect)

defect
Not set
blocker

Tracking

(Not tracked)

RESOLVED FIXED
mozilla2.0b5

People

(Reporter: standard8, Assigned: standard8)

References

Details

Attachments

(2 files, 3 obsolete files)

Attached patch The fix (obsolete) — Splinter Review
toolkit/locales/l10n.mk was designed to be implemented for multiple applications.

I'm now trying to incorporate it for Thunderbird, when I build I'm getting:

make: *** No rule to make target `/Users/moztest/comm/main/src/toolkit/mozapps/installer/packager.mk'.

This is because l10n.mk is using $(topsrcdir) rather than $(MOZILLA_DIR). In Firefox builds, $(MOZILLA_DIR) points to $(topsrcdir), however in Thunderbird builds, $(MOZILLA_DIR) points to $(topsrcdir)/mozilla.

Therefore we need a simple fix just to correct the inclusion.
Attachment #466598 - Flags: review?(mitchell.field)
Blocks: 587986
Comment on attachment 466598 [details] [diff] [review]
The fix

Sorry, in doing some more thorough testing, I've just found a few more instances where this needs to be applied. Will attach a new patch in a bit.
Attachment #466598 - Attachment is obsolete: true
Attachment #466598 - Flags: review?(mitchell.field)
Attached patch The fix v2Splinter Review
I believe this one will work fine - I've run through the Thunderbird buildbot steps on both Mac and Windows and the repackaging works fine with this patch.

MOZDEPTH is a similar creation to MOZILLA_DIR - it just points to the objdir/mozilla directory for comm-central apps and objdir/ for Firefox.
Attachment #466627 - Flags: review?(mitchell.field)
Attachment #466627 - Flags: review?(mitchell.field) → review+
Comment on attachment 466627 [details] [diff] [review]
The fix v2

Requesting approval for this build config only change. Should have no effect on Firefox's builders, but means that Thunderbird (and other comm-central apps) can use l10n.mk as well.
Attachment #466627 - Flags: approval2.0?
Attachment #466627 - Flags: approval2.0? → approval2.0+
Checked in: http://hg.mozilla.org/mozilla-central/rev/c9e08ae58ae4
Status: NEW → RESOLVED
Closed: 14 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → mozilla2.0b5
Blocks: 554993
MOZDEPTH isn't defined in mozilla-central, this breaks Firefox l10n builds.
Severity: normal → blocker
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
probably need to use some |ifdef COMM_BUILD| stuff there (that var is defined in the c-c build system, but not defined in the Mozilla one).
I have a better idea, patch up in a few mins.
Attached patch Fix Firefox l10n bustage (obsolete) — Splinter Review
Fix the Firefox L10n bustage - only use MOZDEPTH if it is defined, if not fallback to DEPTH.
Attachment #467472 - Flags: review+
This one has hg headers (hopefully)!
Attachment #467472 - Attachment is obsolete: true
Attachment #467494 - Flags: review+
Attachment #467494 - Attachment is obsolete: true
Attachment #467497 - Flags: review+
Checked in http://hg.mozilla.org/mozilla-central/rev/3bd62d459019

I'll leave marking this as FIXED to someone that knows what's going on here better.
From what I can tell from a quick look at Tinderbox, the issues in Firefox are now fixed, so this bug is fixed.
Status: REOPENED → RESOLVED
Closed: 14 years ago14 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.