Bug 1099430, part 0: Miscellaneous fixes to use mozilla-central's build system, r=glandium.
authorJoshua Cranmer <Pidgeot18@gmail.com>
Fri, 05 Dec 2014 11:38:26 -0600
changeset 21454 cd681dd9d73d06eb687aefa8230575c5fd7ff96c
parent 21453 ca96926af3043084d8dff2abf9751fb84519c58c
child 21455 7254179a9d7d8fcb6b6847e31f82847fc309c69c
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1099430, 1001332
Bug 1099430, part 0: Miscellaneous fixes to use mozilla-central's build system, r=glandium. The MOZILLA_INTERNAL_API logic was killed... several months ago, so the MAPI Makefiles get a simple -DMOZILLA_INTERNAL_API=1 definition, which is all they really wanted from declaration. The Windows Search component needs MOZ_WINCONSOLE, since it was relying on the default linker, but bug 1001332 needs to explicitly choose GUI-versus-Console, and the default isn't what the search code wants.
mail/components/search/wsenable/Makefile.in
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/build/moz.build
new file mode 100644
--- /dev/null
+++ b/mail/components/search/wsenable/Makefile.in
@@ -0,0 +1,6 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_WINCONSOLE = 0
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -5,15 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -13,9 +13,12 @@ SOURCES += [
 
 OS_LIBS += [
     'ole32',
 ]
 
 DEFINES['UNICODE'] = True
 DEFINES['_UNICODE'] = True
 
+if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    DEFINES['MOZILLA_INTERNAL_API'] = True
+
 DEFFILE	= SRCDIR + '/Mapi32.def'
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -5,20 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-endif
-
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
 INSTALL_TARGETS += msgmapi
 msgmapi_FILES := msgMapi.h
 msgmapi_DEST = $(DIST)/include
 msgmapi_TARGET := export
 
 SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -9,9 +9,13 @@ OS_LIBS += [
     'rpcrt4',
 ]
 
 for var in ('REGISTER_PROXY_DLL', 'UNICODE', '_UNICODE'):
     DEFINES[var] = True
 
 DEFINES['_WIN32_WINNT'] = '0x400'
 
+if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    DEFINES['MOZILLA_INTERNAL_API'] = True
+
 DEFFILE = SRCDIR + '/MapiProxy.def'
+