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

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mark Banner (:standard8)]

Attachment: The fix

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.

Comment 1

[Mark Banner (:standard8)]

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.

Comment 2

[Mark Banner (:standard8)]

Attachment: The fix v2

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.

Comment 3

[Mark Banner (:standard8)]

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.

Comment 4

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/mozilla-central/rev/c9e08ae58ae4

Comment 5

[Axel Hecht [:Pike]]

MOZDEPTH isn't defined in mozilla-central, this breaks Firefox l10n builds.

Comment 6

[Robert Kaiser]

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).

Comment 7

[Mark Banner (:standard8)]

I have a better idea, patch up in a few mins.

Comment 8

[Mark Banner (:standard8)]

Attachment: Fix Firefox l10n bustage

Fix the Firefox L10n bustage - only use MOZDEPTH if it is defined, if not fallback to DEPTH.

Comment 9

[Mark Banner (:standard8)]

Attachment: Fix Firefox l10n bustage - for check-in

This one has hg headers (hopefully)!

Comment 10

[Mark Banner (:standard8)]

Attachment: Fix Firefox l10n bustage - for check-in (correct one)

Comment 11

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

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.

Comment 12

[Mark Banner (:standard8)]

From what I can tell from a quick look at Tinderbox, the issues in Firefox are now fixed, so this bug is fixed.