Bug 669040 part 2: Add new db/ directory to the build-system. r=Standard8
authorMatheus Kerschbaum <matjk7@gmail.com>
Mon, 25 Jul 2011 23:01:00 -0700
changeset 8659 1dbfc673bc3f4b223a1a418e72d17ebdc7a48cfb
parent 8658 52efa9789800829c6f0ee6a005f83ed45a250396
child 8660 cfb57e11ca398adcc3f44ee2dd6da554b8794ad5
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs669040
Bug 669040 part 2: Add new db/ directory to the build-system. r=Standard8
allmakefiles.sh
bridge/bridge.mk
configure.in
db/makefiles.sh
db/mork/Makefile.in
mail/confvars.sh
suite/confvars.sh
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -59,16 +59,20 @@ add_makefiles "
 Makefile
 config/autoconf.mk
 "
 
 if [ "$MOZ_LDAP_XPCOM" ]; then
   . "${srcdir}/ldap/makefiles.sh"
 fi
 
+if [ "$MOZ_MORK" ]; then
+  . "${srcdir}/db/makefiles.sh"
+fi
+
 if [ "$MOZ_COMPOSER" ]; then
   . "${srcdir}/editor/ui/makefiles.sh"
 fi
 
 if [ "$MOZ_MAIL_NEWS" ]; then
   . "${srcdir}/mailnews/makefiles.sh"
 fi
 
--- a/bridge/bridge.mk
+++ b/bridge/bridge.mk
@@ -38,15 +38,19 @@ INCLUDED_BRIDGE_MK = 1
 
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
 
 #ifdef MOZ_LDAP_XPCOM
 APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
 #endif
 
+#ifdef MOZ_MORK
+APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
+#endif
+
 ifdef MOZ_MAIL_NEWS
 APP_LIBXUL_DIRS += \
   $(DEPTH)$(SUBDIR)/mailnews/base \
   $(DEPTH)$(SUBDIR)/mailnews/mime/public \
   $(DEPTH)$(SUBDIR)/mailnews \
   $(NULL)
 endif
--- a/configure.in
+++ b/configure.in
@@ -6740,16 +6740,20 @@ if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
   fi
 fi
 
 dnl Only build Mork if it's required
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
+  MORK_COMPONENT=mork
+  export MORK_COMPONENT
+  MORK_MODULE="MODULE(nsMorkModule)"
+  export MORK_MODULE
 fi
 
 dnl Build the lightweight Mork reader if required
 AC_SUBST(MOZ_MORKREADER)
 if test "$MOZ_MORKREADER"; then
   AC_DEFINE(MOZ_MORKREADER)
 fi
 
new file mode 100644
--- /dev/null
+++ b/db/makefiles.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the the Mozilla build system
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+add_makefiles "
+db/Makefile
+db/mork/Makefile
+db/mork/public/Makefile
+db/mork/build/Makefile
+db/mork/src/Makefile
+"
--- a/db/mork/Makefile.in
+++ b/db/mork/Makefile.in
@@ -37,12 +37,14 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src build public
+MODULE = mork
+
+DIRS = public src build
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -45,18 +45,18 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
-MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT"
-MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE"
+MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -47,16 +47,16 @@ MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
-MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT"
-MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE"
+MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
+MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 MOZ_SERVICES_SYNC=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION