[Bug 953102] external api build bustage: ../../../mail/components/build/libmailcomps.a: No such file or directory. r=jcranmer?
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 02 Apr 2014 21:59:24 +0300
changeset 15964 51974b3f7cbc589c5ecad501b637624735de4a4e
parent 15963 5b98bc77a2810331fe3fec4bdce45809cd77f9b0
child 15965 50444e73055af39c88bd1a388c8893f90745820b
push id10000
push usermkmelin@iki.fi
push dateWed, 02 Apr 2014 19:03:13 +0000
treeherdercomm-central@50444e73055a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs953102
[Bug 953102] external api build bustage: ../../../mail/components/build/libmailcomps.a: No such file or directory. r=jcranmer? Landing on CLOSED TREE.
mail/components/build/Makefile.in
mail/components/build/moz.build
mail/components/shell/DirectoryProvider.cpp
mail/components/shell/nsMailGNOMEIntegration.cpp
mailnews/base/src/nsMessengerUnixIntegration.cpp
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -4,16 +4,25 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+MODULE_NAME	= nsMailCompsModule
+EXTRA_DSO_LDOPTS += \
+	$(XPCOM_GLUE_LDOPTS) \
+	$(NSPR_LIBS) \
+	$(GLIB_LIBS) \
+	$(NULL)
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../migration/src \
 	-I$(srcdir)/../shell \
 	-I$(srcdir)/../history \
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -4,13 +4,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsMailComps.cpp',
 ]
 
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
-FINAL_LIBRARY = 'xul'
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    FINAL_LIBRARY = 'xul'
+
 EXPORT_LIBRARY = True
-
 LIBRARY_NAME = 'mailcomps'
 
+
--- a/mail/components/shell/DirectoryProvider.cpp
+++ b/mail/components/shell/DirectoryProvider.cpp
@@ -4,17 +4,17 @@
 
 #include "nsIDirectoryService.h"
 #include "DirectoryProvider.h"
 
 #include "nsIFile.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
-
+#include "nsIProperties.h"
 #include "nsArrayEnumerator.h"
 #include "nsEnumeratorUtils.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsComponentManagerUtils.h"
 #include "nsCOMArray.h"
 #include "nsServiceManagerUtils.h"
 #include "nsStringGlue.h"
--- a/mail/components/shell/nsMailGNOMEIntegration.cpp
+++ b/mail/components/shell/nsMailGNOMEIntegration.cpp
@@ -12,17 +12,16 @@
 #include "nsIFile.h"
 #include "nsIStringBundle.h"
 #include "nsIPromptService.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsEmbedCID.h"
-#include "nsIStringBundle.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Services.h"
 
 #include <glib.h>
 #include <limits.h>
 #include <stdlib.h>
 
 using mozilla::ArrayLength;
--- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
@@ -18,17 +18,16 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIDirectoryService.h"
 #include "nsIWindowWatcher.h"
 #include "nsIWindowMediator.h"
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"
 #include "nsIBaseWindow.h"
-#include "nsIWidget.h"
 #include "MailNewsTypes.h"
 #include "nsIMessengerWindowService.h"
 #include "prprf.h"
 #include "nsIWeakReference.h"
 #include "nsIStringBundle.h"
 #include "nsIAlertsService.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"