651845 - Remove --enable/disable-static-mail

Status: RESOLVED FIXED

Description

[Mark Banner (:standard8)]

As discussed on mdat, I want to remove the --enable/disable-static-mail option from mailnews. The reasons for supporting it are no longer significant, and having to keep maintaining two sets of module registrations is not useful.

I also believe that we should be able to reduce some of the complexity around our current mailnews/base/util library and just generally make mailnews build config simpler.

Comment 1

[Mark Banner (:standard8)]

Created attachment 529346 [details] [diff] [review]
The fix

This does the necessary to remove the shared configuration. There's quite a few removals of files in here, which should make our makefiles a lot simpler.

(From the discussion on mdat, I saw no significant objections to doing this, and this simplifies the configuration which makes other build config changes simpler).

Comment 2

[Mark Banner (:standard8)]

This passed on try server btw.

Comment 3

[Justin Wood (:Callek)]

Comment on attachment 529346 [details] [diff] [review]
The fix

>diff --git a/mailnews/base/util/Makefile.in b/mailnews/base/util/Makefile.in
>--- a/mailnews/base/util/Makefile.in
>+++ b/mailnews/base/util/Makefile.in
>@@ -43,14 +43,7 @@ VPATH		= @srcdir@
> include $(DEPTH)/config/autoconf.mk
> 
> MODULE		= msgbaseutil
>-
>-ifndef MOZ_STATIC_MAIL_BUILD
>-LIBRARY_NAME	= msgbaseutil
>-EXPORT_LIBRARY = 1
>-SHORT_LIBNAME	= msgbsutl
>-else
> LIBRARY_NAME	= msgbsutl_s
>-endif

nit, I actually don't see a need to have msgbsutl_s anymore, and should go with msbsutil (since the _s was added as a "static" delim)


Overall this looks good, my one nit, which would require changes outside of where I applied the nit, so I don't mind if you defer that to a followup bug. I would also appreciate on addition run through try (c-c+m-c, or c-c+m-a) before this lands proper.

Comment 4

[Mark Banner (:standard8)]

(In reply to comment #3)
> nit, I actually don't see a need to have msgbsutl_s anymore, and should go
> with msbsutil (since the _s was added as a "static" delim)

I disagree, it is still a static lib (and it would still get included in both mailnews & import if they're built separately). So I don't think this is necessary, but if you really think it is a necessary change, then we can do that in a follow-up bug.


I've now landed it: http://hg.mozilla.org/comm-central/rev/18fbc091e23f

Comment 5

[Justin Wood (:Callek)]

(In reply to comment #4)
> (In reply to comment #3)
> > nit, I actually don't see a need to have msgbsutl_s anymore, and should go
> > with msbsutil (since the _s was added as a "static" delim)
> 
> I disagree,...

I don't feel that strongly, but if someone else notices this bug (who is at least a peer) and wants it, lets get said followup on file, otherwise no big deal.

Comment 6

[[e-mail]]

Does this mean that we don't need NS_MSG_BASE any more, since all the mail modules are always linked into the same DSO (either libxul or, for highly experimental xulrunner builds, libmail)?

Comment 7

[Mark Banner (:standard8)]

(In reply to comment #6)
> Does this mean that we don't need NS_MSG_BASE any more, since all the mail
> modules are always linked into the same DSO (either libxul or, for highly
> experimental xulrunner builds, libmail)?

Not quite, I think we'd need to move libimport into libmail for us to be able to do that (which IMO, I think we should consider doing).

Comment 8

[Mark Banner (:standard8)]

I pushed a follow-up to remove the redundant Makefile listings in mailnews/makefiles.sh: http://hg.mozilla.org/comm-central/rev/622605d68e3f