From cbd5a67ec0bfb1cb69a9f29af1f2b2751f1f5529 Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us" <benjamin%smedbergs.us>
Date: Thu, 16 Nov 2006 17:21:46 +0000
Subject: [PATCH] Bug 360584 - Add client.mk checkout for Tamarin,
 r=stejohns/kairo

---
 client.mk | 53 ++++++++++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/client.mk b/client.mk
index ff30e6acbb77..0bc7ecd3815d 100644
--- a/client.mk
+++ b/client.mk
@@ -44,7 +44,8 @@
 #    1. cvs co mozilla/client.mk
 #    2. cd mozilla
 #    3. create your .mozconfig file with
-#       mk_add_options MOZ_CO_PROJECT=suite,browser,mail,minimo,xulrunner
+#       mk_add_options MOZ_CO_PROJECT=
+#         suite,browser
 #    4. gmake -f client.mk 
 #
 # This script will pick up the CVSROOT from the CVS/Root file. If you wish
@@ -54,7 +55,7 @@
 #   export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
 # 
 # You must specify which products/modules you wish to checkout, with
-#   MOZ_CO_PROJECT, MOZ_CO_MODULE, and BUILD_MODULES variables.
+#   MOZ_CO_PROJECT and MOZ_CO_MODULE variables.
 #
 #   MOZ_CO_PROJECT possibilities include the following:
 #     suite (Seamonkey suite)
@@ -65,6 +66,7 @@
 #     calendar (aka Sunbird, use this to build the calendar extensions also)
 #     xulrunner
 #     camino
+#     tamarin
 #
 # Other common MOZ_CO_MODULE options include the following:
 #   mozilla/other-licenses/libart_lgpl
@@ -113,6 +115,7 @@ AVAILABLE_PROJECTS = \
   xulrunner \
   camino \
   necko \
+  tamarin \
   $(NULL)
 
 # Trailing / on top-level mozilla dir required to stop fast-update thinking
@@ -383,6 +386,11 @@ BOOTSTRAP_camino :=                             \
   mozilla/camino/config/mozconfig               \
   $(NULL)
 
+MODULES_tamarin :=                              \
+  mozilla/js/tamarin                            \
+  mozilla/modules/zlib                          \
+  $(NULL)
+
 MODULES_all :=                                  \
   mozilla/other-licenses/bsdiff                 \
   mozilla/other-licenses/libart_lgpl            \
@@ -403,8 +411,6 @@ NSS_CO_TAG           = NSS_3_11_20060929_TAG
 LDAPCSDK_CO_TAG      = ldapcsdk_5_17_client_branch
 LOCALES_CO_TAG       =
 
-BUILD_MODULES = all
-
 #######################################################################
 # Defines
 #
@@ -612,31 +618,6 @@ endif
 LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) $(if $(LDAPCSDK_CO_TAG),-r $(LDAPCSDK_CO_TAG),-A)
 CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
 
-####################################
-# CVS defines for standalone modules
-#
-ifeq ($(BUILD_MODULES),all)
-  CHECKOUT_STANDALONE := true
-  CHECKOUT_STANDALONE_NOSUBDIRS := true
-else
-  STANDALONE_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
-  STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
-  STANDALONE_CO_MODULE += Makefile.in
-
-  MOZ_MODULE_LIST += $(addprefix mozilla/,$(STANDALONE_CO_MODULE))
-  MOZ_MODULE_LIST_NS += $(addprefix mozilla/,$(BUILD_MODULE_CVS_NS))
-
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_NSPR :=
-endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_NSS :=
-endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_LDAPCSDK :=
-endif
-endif
-
 ####################################
 # Error on obsolete variables.
 #
@@ -667,6 +648,20 @@ endif
 MOZ_MODULE_LIST := $(sort $(MOZ_MODULE_LIST))
 MOZ_MODULE_LIST_NS := $(sort $(MOZ_MODULE_LIST_NS))
 
+####################################
+# Suppress standalone modules if they're not needed.
+#
+ifeq (,$(filter mozilla/xpcom,$(MOZ_MODULE_LIST)))
+  CVSCO_NSPR :=
+endif
+
+ifeq (,$(filter mozilla/security/manager,$(MOZ_MODULE_LIST)))
+  CVSCO_NSS :=
+endif
+ifeq (,$(filter mozilla/directory/xpcom,$(MOZ_MODULE_LIST)))
+  CVSCO_LDAPCSDK :=
+endif
+
 MODULES_CO_FLAGS := -P
 ifdef MOZ_CO_FLAGS
   MODULES_CO_FLAGS := $(MOZ_CO_FLAGS)