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)
Firefox Build System
General
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla2.0b5
People
(Reporter: standard8, Assigned: standard8)
References
Details
Attachments
(2 files, 3 obsolete files)
2.06 KB,
patch
|
Mitch
:
review+
benjamin
:
approval2.0+
|
Details | Diff | Splinter Review |
729 bytes,
patch
|
standard8
:
review+
|
Details | Diff | 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)
Assignee | ||
Comment 1•14 years ago
|
||
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)
Assignee | ||
Comment 2•14 years ago
|
||
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)
Updated•14 years ago
|
Attachment #466627 -
Flags: review?(mitchell.field) → review+
Assignee | ||
Comment 3•14 years ago
|
||
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?
Updated•14 years ago
|
Attachment #466627 -
Flags: approval2.0? → approval2.0+
Assignee | ||
Comment 4•14 years ago
|
||
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
Comment 5•14 years ago
|
||
MOZDEPTH isn't defined in mozilla-central, this breaks Firefox l10n builds.
Severity: normal → blocker
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Comment 6•14 years ago
|
||
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).
Assignee | ||
Comment 7•14 years ago
|
||
I have a better idea, patch up in a few mins.
Assignee | ||
Comment 8•14 years ago
|
||
Fix the Firefox L10n bustage - only use MOZDEPTH if it is defined, if not fallback to DEPTH.
Updated•14 years ago
|
Attachment #467472 -
Flags: review+
Updated•14 years ago
|
Attachment #467472 -
Flags: review+
Assignee | ||
Comment 9•14 years ago
|
||
This one has hg headers (hopefully)!
Attachment #467472 -
Attachment is obsolete: true
Attachment #467494 -
Flags: review+
Assignee | ||
Comment 10•14 years ago
|
||
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.
Assignee | ||
Comment 12•14 years ago
|
||
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 ago → 14 years ago
Resolution: --- → FIXED
Updated•6 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•