Bug 533332 - [regression] "make -C mailnews xpcshell-tests" doesn't run composer tests; Fix v2a - original fix for 509367 + standard8's suggestion.
authorBen Bucksch <ben.bucksch@beonex.com>
Tue, 12 Jan 2010 16:05:28 +0100
changeset 4685 5fdf1bd04492496f35d4829f1b65603b863d6ac0
parent 4684 161b631365876a6e369c4c4e24fc631561a3621a
child 4686 6f191f4def81b171477562b4f90c68f5399664dc
push id3664
push usersgautherie.bz@free.fr
push dateTue, 12 Jan 2010 15:10:29 +0000
treeherdercomm-central@5fdf1bd04492 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs533332, 509367
Bug 533332 - [regression] "make -C mailnews xpcshell-tests" doesn't run composer tests; Fix v2a - original fix for 509367 + standard8's suggestion. r=Standard8.
mail/build.mk
mailnews/Makefile.in
suite/build.mk
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -63,16 +63,17 @@ endif
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 else
 tier_app_dirs += mail/branding/nightly
 endif
 
 tier_app_dirs += \
 	mailnews/base \
+	mailnews/mime/public \
 	mailnews \
 	$(NULL)
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -39,26 +39,36 @@ DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
 
-PARALLEL_DIRS	+= base/search/src db/msgdb db/gloda news local mime imap addrbook import extensions
+PARALLEL_DIRS	+= \
+	addrbook \
+	base/search/src \
+	compose \
+	db/gloda \
+	db/msgdb \
+	extensions\
+	imap \
+	import \
+	local \
+	mime \
+	news \
+	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 PARALLEL_DIRS	+= mapi/mapiDLL mapi/mapihook
 endif
 endif
 
-DIRS = compose
-
 ifdef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 else
 DIRS += base/build
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -60,17 +60,21 @@ ifdef MOZ_COMPOSER
 tier_app_dirs += editor/ui
 endif
 
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 endif
 
 ifdef MOZ_MAIL_NEWS
-tier_app_dirs += mailnews/base mailnews
+tier_app_dirs += \
+	mailnews/base \
+	mailnews/mime/public \
+	mailnews \
+	$(NULL)
 endif
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \
 	suite \