Bug 882968 - Move DEFINES to moz.build, part 1: mailnews/. r=Standard8
authorJoshua Cranmer <Pidgeot18@gmail.com>
Sat, 23 Nov 2013 23:26:09 -0600
changeset 16925 0fef4c10f850ccba2794cbb08991741922a06644
parent 16924 1d01ba2ddd2b190ef59955f7fbe43130eb6f1a29
child 16926 4852f232b25f46257bf88243bcb8fe7b76a24aa3
push id1074
push userbugzilla@standard8.plus.com
push dateMon, 03 Feb 2014 22:47:23 +0000
treeherdercomm-beta@6b791b5369ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs882968
Bug 882968 - Move DEFINES to moz.build, part 1: mailnews/. r=Standard8
mailnews/Makefile.in
mailnews/addrbook/src/Makefile.in
mailnews/addrbook/src/moz.build
mailnews/base/src/Makefile.in
mailnews/base/util/Makefile.in
mailnews/base/util/moz.build
mailnews/build/Makefile.in
mailnews/build/moz.build
mailnews/compose/src/Makefile.in
mailnews/imap/src/Makefile.in
mailnews/import/eudora/src/Makefile.in
mailnews/import/oexpress/Makefile.in
mailnews/mime/src/Makefile.in
mailnews/mime/src/moz.build
mailnews/moz.build
mailnews/news/src/Makefile.in
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -7,21 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
-DEFINES += -DOS_ARCH=$(OS_ARCH) \
-           -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
-           -DNO_NSPR_10_SUPPORT \
-           $(NULL)
-
 ifdef ENABLE_TESTS
 RESDIR = $(srcdir)/test/resources
 FAKESERVER := $(srcdir)/test/fakeserver
 TESTING_JS_MODULE_DIR = mailnews
 TESTING_JS_MODULES += \
 	$(RESDIR)/IMAPpump.js \
 	$(RESDIR)/localAccountUtils.js \
 	$(RESDIR)/mailTestUtils.js \
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -9,19 +9,10 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
-ifdef MOZ_LDAP_XPCOM
-DEFINES += -DMOZ_LDAP_XPCOM
-
-# XXX These files are not being built as they don't work. Bug 311632 should
-# fix them.
-# nsAbLDAPChangeLogQuery.cpp
-# nsAbLDAPChangeLogData.cpp
-endif
-
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -62,21 +62,27 @@ if CONFIG['MOZ_LDAP_XPCOM']:
         'nsAbLDAPDirectoryModify.cpp',
         'nsAbLDAPDirectoryQuery.cpp',
         'nsAbLDAPDirFactory.cpp',
         'nsAbLDAPListenerBase.cpp',
         'nsAbLDAPReplicationData.cpp',
         'nsAbLDAPReplicationQuery.cpp',
         'nsAbLDAPReplicationService.cpp',
     ]
+    # XXX These files are not being built as they don't work. Bug 311632 should
+    # fix them.
+    # nsAbLDAPChangeLogQuery.cpp
+    # nsAbLDAPChangeLogData.cpp
 
     EXTRA_COMPONENTS += [
         'nsAbLDAPAutoCompleteSearch.js',
     ]
 
+    DEFINES['MOZ_LDAP_XPCOM'] = True
+
 EXTRA_COMPONENTS += [
     'nsAbAutoCompleteMyDomain.js',
     'nsAbAutoCompleteSearch.js',
     'nsAbLDAPAttributeMap.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
deleted file mode 100644
--- a/mailnews/base/src/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_LDAP_XPCOM
-DEFINES         += -DMOZ_LDAP_XPCOM
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/base/util/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES		+= -D_IMPL_NS_MSG_BASE
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DZLIB_DLL
-OS_CXXFLAGS	+= -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -66,8 +66,9 @@ EXTRA_JS_MODULES += [
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'msgbsutl_s'
 
+DEFINES['_IMPL_NS_MSG_BASE'] = True
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -9,24 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= nsMailModule
 endif
 
-ifdef MOZ_LDAP_XPCOM
-DEFINES		+= -DMOZ_LDAP_XPCOM
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DZLIB_DLL
-endif
-
 SHARED_LIBRARY_LIBS = \
 	        ../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
 		../base/src/$(LIB_PREFIX)msgbase_s.$(LIB_SUFFIX) \
 		../base/search/src/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
 		../local/src//$(LIB_PREFIX)msglocal_s.$(LIB_SUFFIX) \
 	        ../compose/src/$(LIB_PREFIX)msgcompose_s.$(LIB_SUFFIX) \
 	        ../db/msgdb/src/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX) \
 	        ../imap/src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -12,8 +12,10 @@ if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKA
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
 LIBRARY_NAME = 'mail'
 
+if CONFIG['MOZ_LDAP_XPCOM']:
+    DEFINES['MOZ_LDAP_XPCOM'] = True
deleted file mode 100644
--- a/mailnews/compose/src/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_UNICODE
-DEFINES		+= -DMOZ_UNICODE
-endif
-endif
deleted file mode 100644
--- a/mailnews/imap/src/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -5,15 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/import/oexpress/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/mime/src/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES		+= -DENABLE_SMIME
-
-include $(topsrcdir)/config/rules.mk
-
-
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -76,8 +76,9 @@ EXTRA_COMPONENTS += [
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mime_s'
 
+DEFINES['ENABLE_SMIME'] = True
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -52,8 +52,10 @@ if CONFIG['MOZ_MAPI_SUPPORT']:
         'mapi/mapihook',
     ]
 
 DIRS += [
     'build',
     'import/build',
 ]
 
+DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
+DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
deleted file mode 100644
--- a/mailnews/news/src/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
-