Closed Bug 495604 Opened 15 years ago Closed 15 years ago

[SeaMonkey] Make ifndef MOZ_SUITE in dlmgr Makefile.in actually work

Categories

(Toolkit :: Downloads API, defect)

1.9.1 Branch
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla1.9.2a1

People

(Reporter: kairo, Assigned: kairo)

References

(Blocks 1 open bug)

Details

(Keywords: verified1.9.1)

Attachments

(1 file)

http://mxr.mozilla.org/comm-central/source/mozilla/toolkit/components/downloads/src/Makefile.in#88 has an |ifndef MOZ_SUITE| that should exclude the UI components to be added as we are shoving our own into the same components/ directory which registers for the same contract ID and implements nsIDownloadManagerUI as well.

The exclusion is done because we can't guarantee that a component later in the alphabet will override the one earlier in the same directory (works fine on XULRunner where app-specific components are always loaded on top of platform ones) - and exactly that seems to cause our unit test machines on Linux to fail right now.

The problem is that MOZ_SUITE is nowadays defined in SeaMonkey's app-config.mk which is loaded by config.mk but we only have inlcuded autoconf.mk at this point in the Makefile.
Here's the pretty straight forward patch, including config.mk right before using what it defines should help us there.
Assignee: nobody → kairo
Status: NEW → ASSIGNED
Attachment #380602 - Flags: review?(ted.mielczarek)
Summary: Make ifndef MOZ_SUITE in dlmgr Makefile.in actually work → [SeaMonkey] Make ifndef MOZ_SUITE in dlmgr Makefile.in actually work
Target Milestone: --- → mozilla1.9.2a1
Comment on attachment 380602 [details] [diff] [review]
include config.mk right before that ifndef

I have a hunch that sdwilsh might come around to look into this today and that he knows dlmgr Makefiles :)
Attachment #380602 - Flags: review?(ted.mielczarek) → review?(sdwilsh)
Comment on attachment 380602 [details] [diff] [review]
include config.mk right before that ifndef

r=sdwilsh
Attachment #380602 - Flags: review?(sdwilsh) → review+
Pushed as http://hg.mozilla.org/mozilla-central/rev/801b58b8bc0e
Status: ASSIGNED → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
Comment on attachment 380602 [details] [diff] [review]
include config.mk right before that ifndef

This is a trivial fix to make the ifndef in that file actually work (affects SeaMonkey only).
Attachment #380602 - Flags: approval1.9.1?
Comment on attachment 380602 [details] [diff] [review]
include config.mk right before that ifndef

a191=beltzner, again. seems to be properly NPOTB here.
Attachment #380602 - Flags: approval1.9.1? → approval1.9.1+
Flags: in-testsuite+
Blocks: 381157
No longer depends on: 381157
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: