bug 290490 - integrate suite/ into build process, also adding MOZ_SUITE define for suite-specific stuff, r=bsmedberg sr=Neil a=asa

Makefile.in

@@ -365,6 +365,10 @@ ifdef MOZ_SUNBIRD
 tier_99_dirs	+= calendar/sunbird
 endif
 
+ifdef MOZ_SUITE
+tier_99_dirs	+= suite
+endif
+
 ifdef MOZ_XUL_APP
 ifdef MOZ_INSTALLER
 tier_99_dirs     +=  toolkit/mozapps/installer

allmakefiles.sh

@@ -899,6 +899,10 @@ browser/themes/winstripe/browser/Makefile
 browser/themes/winstripe/Makefile
 "
 
+MAKEFILES_suite="
+suite/Makefile
+"
+
 MAKEFILES_xulrunner="
 xulrunner/Makefile
 xulrunner/app/Makefile
@@ -1578,6 +1582,10 @@ if test -n "$MOZ_PHOENIX"; then
     add_makefiles "$MAKEFILES_phoenix"
 fi
 
+if test -n "$MOZ_SUITE"; then
+    add_makefiles "$MAKEFILES_suite"
+fi
+
 if test -n "$MOZ_XUL_APP"; then
     add_makefiles "$MAKEFILES_xulapp"
 fi

client.mk

@@ -98,7 +98,7 @@ AVAILABLE_PROJECTS = \
   macbrowser \
   $(NULL)
 
-MODULES_suite :=                                \
+MODULES_core :=                                \
   SeaMonkeyAll                                  \
   mozilla/ipc/ipcd                              \
   mozilla/modules/libpr0n                       \
@@ -109,21 +109,30 @@ MODULES_suite :=                                \
   mozilla/db/sqlite3                            \
   $(NULL)
 
-LOCALES_suite :=                                \
+LOCALES_core :=                                 \
   netwerk                                       \
   dom                                           \
   $(NULL)
 
 MODULES_toolkit :=                              \
-  $(MODULES_suite)                              \
+  $(MODULES_core)                               \
   mozilla/chrome                                \
   $(NULL)
 
 LOCALES_toolkit :=                              \
-  $(LOCALES_suite)                              \
+  $(LOCALES_core)                               \
   toolkit                                       \
   $(NULL)
 
+MODULES_suite :=                                \
+  $(MODULES_core)                               \
+  mozilla/suite                                 \
+  $(NULL)
+
+LOCALES_suite :=                                \
+  $(LOCALES_core)                               \
+  $(NULL)
+
 MODULES_browser :=                              \
   $(MODULES_toolkit)                            \
   mozilla/browser                               \
@@ -174,7 +183,7 @@ MODULES_xulrunner :=                            \
 BOOTSTRAP_xulrunner := mozilla/xulrunner/config/mozconfig
 
 MODULES_macbrowser :=                           \
-  $(MODULES_suite)                              \
+  $(MODULES_core)                               \
   mozilla/camino                                \
   $(NULL)
 

configure.in

@@ -3511,9 +3511,11 @@ suite)
   MOZ_MAIL_NEWS=1
   MOZ_LDAP_XPCOM=1
   MOZ_COMPOSER=1
+  MOZ_SUITE=1
   MOZ_PROFILESHARING=1
   MOZ_APP_VERSION=$MOZILLA_VERSION
   MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions"
+  AC_DEFINE(MOZ_SUITE)
   ;;
 
 browser)

suite/Makefile.in

@@ -0,0 +1,46 @@
+#
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# the mozilla.org SeaMonkey project.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# 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 *****
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+
+include $(topsrcdir)/config/rules.mk

suite/README

@@ -0,0 +1,7 @@
+mozilla/suite
+=============
+
+This module contains files for the SeaMonkey suite.
+
+Consult http://www.mozilla.org/projects/seamonkey/review-and-flags.html
+for review rules on stuff in this directory, please.