Add psm to standalone build system.

Pull psm & nss by default via client.mk .
Moves psm-glue from Mozilla build to psm module.
Bug #60912. r=bryner
CARPOOL!

allmakefiles.sh

@@ -685,6 +685,33 @@ security/psm/lib/client/Makefile
 security/psm/lib/protocol/Makefile
 "
 
+MAKEFILES_psm_glue="
+extensions/psm-glue/public/Makefile
+extensions/psm-glue/Makefile
+extensions/psm-glue/src/Makefile
+netwerk/base/public/Makefile
+netwerk/socket/base/Makefile
+dom/public/Makefile
+uriloader/base/Makefile
+modules/libpref/public/Makefile
+profile/public/Makefile
+caps/idl/Makefile
+caps/include/Makefile
+modules/appfilelocprovider/public/Makefile
+netwerk/protocol/http/public/Makefile
+widget/public/Makefile
+rdf/base/idl/Makefile
+xpfe/appshell/public/Makefile
+gfx/idl/Makefile
+gfx/public/Makefile
+docshell/base/Makefile
+layout/html/forms/public/Makefile
+layout/base/public/Makefile
+rdf/content/public/Makefile
+dom/src/base/Makefile
+modules/oji/public/Makefile
+"
+
 MAKEFILES_transformiix="
 extensions/transformiix/source/base/Makefile
 extensions/transformiix/source/main/Makefile
@@ -836,11 +863,6 @@ for extension in $MOZ_EXTENSIONS; do
 	    extensions/cookie/Makefile
 	    extensions/cookie/tests/Makefile
             " ;;
-        psm-glue ) MAKEFILES_extensions="$MAKEFILES_extensions
-	    extensions/psm-glue/public/Makefile
-	    extensions/psm-glue/Makefile
-	    extensions/psm-glue/src/Makefile
-            " ;;
         irc ) MAKEFILES_extensions="$MAKEFILES_extensions
 	    extensions/irc/Makefile
 	    extensions/irc/xul/Makefile
@@ -956,6 +978,8 @@ else
 	    necko) add_makefiles "
                  $MAKEFILES_netwerk $MAKEFILES_xpcom $MAKEFILES_libreg"
 		;;
+	    psm) add_makefiles "$MAKEFILES_dbm $MAKEFILES_xpcom $MAKEFILES_libreg $MAKEFILES_intl $MAKEFILES_libjar $MAKEFILES_security $MAKEFILES_js $MAKEFILES_psm_glue"
+		;;
 	    transformiix) add_makefiles "$MAKEFILES_transformiix"
 		;;
 	    xpcom) add_makefiles "$MAKEFILES_xpcom $MAKEFILES_libreg $MAKEFILES_intl $MAKEFILES_libjar"

build/unix/modules.mk

@@ -53,6 +53,8 @@ BUILD_MODULE_DIRS_security	= $(BUILD_MODULE_DIRS_xpcom) $(BUILD_MODULE_DIRS_dbm)
 BUILD_MODULE_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom
 BUILD_MODULE_DEP_DIRS_xpcom	= intl modules/libjar
 
+BUILD_MODULE_DIRS_psm		= $(BUILD_MODULE_DIRS_dbm) $(BUILD_MODULE_DIRS_xpcom) security netwerk/base/public netwerk/socket/base dom/public $(BUILD_MODULE_DIRS_js) extensions/psm-glue
+BUILD_MODULE_DEP_DIRS_psm	= $(BUILD_MODULE_DEP_DIRS_xpcom) uriloader/base modules/libpref/public profile/public caps/idl modules/appfilelocprovider/public netwerk/protocol/http/public js/src gfx/idl gfx/public rdf/base/idl xpfe/appshell/public widget/public docshell/base layout/html/forms/public layout/base/public rdf/content/public dom/src/base modules/oji/public caps/include
 
 BUILD_MODULE_DIRS += $(foreach mod,$(BUILD_MODULES), $(BUILD_MODULE_DIRS_$(mod)))
 BUILD_MODULE_DEP_DIRS += $(foreach mod,$(BUILD_MODULES), $(BUILD_MODULE_DEP_DIRS_$(mod)))

client.mk

@@ -54,7 +54,8 @@
 # and commit this file on that tag.
 #MOZ_CO_TAG = <tag>
 NSPR_CO_TAG = NSPRPUB_CLIENT_BRANCH
-PSM_CO_TAG = SECURITY_CLIENT_BRANCH
+PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
+NSS_CO_TAG = NSS_CLIENT_TAG
 LDAPCSDK_CO_TAG = LDAPCSDK_40_BRANCH
 BUILD_MODULES = all
 
@@ -180,13 +181,23 @@ endif
 ####################################
 # CVS defines for PSM
 #
-PSM_CO_MODULE= mozilla/security
-PSM_CO_FLAGS := -P
+PSM_CO_MODULE= mozilla/security/psm mozilla/security/Makefile.in
+PSM_CO_FLAGS := -P -A
 ifdef PSM_CO_TAG
   PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
 endif
 CVSCO_PSM = cvs $(CVS_FLAGS) co $(PSM_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(PSM_CO_MODULE)
 
+####################################
+# CVS defines for NSS
+#
+NSS_CO_MODULE= mozilla/security/nss mozilla/security/coreconf
+NSS_CO_FLAGS := -P
+ifdef NSS_CO_TAG
+   NSS_CO_FLAGS := $(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
+endif
+CVSCO_NSS = cvs $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
+
 ####################################
 # CVS defines for NSPR
 #
@@ -220,6 +231,7 @@ ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_DIRS) $(BUILD_MODULE_DEP_DIRS)))
 endif
 ifeq (,$(filter security, $(BUILD_MODULE_DIRS) $(BUILD_MODULE_DEP_DIRS)))
   CVSCO_PSM :=
+  CVSCO_NSS :=
 endif
 ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_DIRS) $(BUILD_MODULE_DEP_DIRS)))
   CVSCO_LDAPCSDK :=
@@ -285,6 +297,7 @@ real_checkout:
 	  if test -f $$failed; then false; else true; fi; }; \
 	cvs_co $(CVSCO_NSPR) && \
 	cvs_co $(CVSCO_PSM) && \
+	cvs_co $(CVSCO_NSS) && \
         cvs_co $(CVSCO_LDAPCSDK) && \
 	cvs_co $(CVSCO_SEAMONKEY)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)

configure

@@ -10617,7 +10617,7 @@ fi
 
 
 
-MOZ_EXTENSIONS_DEFAULT="cookie wallet psm-glue xml-rpc xmlextras"
+MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras"
 
 # Check whether --with-extensions or --without-extensions was given.
 if test "${with_extensions+set}" = set; then
@@ -10625,7 +10625,7 @@ if test "${with_extensions+set}" = set; then
    MOZ_EXTENSIONS=""
     for option in `echo $withval | sed 's/,/ /g'`; do
       if test "$option" = "yes" || test "$option" = "all"; then
-        MOZ_EXTENSIONS="$MOZ_EXTENSIONS cookie irc wallet xmlextras xmlterm psm-glue xml-rpc"
+        MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_DEFAULT irc xmlterm"
       elif test "$option" = "no" || test "$option" = "none"; then
         MOZ_EXTENSIONS=""
       elif test "$option" = "default"; then

configure.in

@@ -3280,14 +3280,14 @@ dnl ========================================================
 dnl Need cookie and wallet to build mozilla, this should
 dnl not be the case, 18352 has been filed.
 dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
-MOZ_EXTENSIONS_DEFAULT="cookie wallet psm-glue xml-rpc xmlextras"
+MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras"
 
 MOZ_ARG_WITH_STRING(extensions,
 [  --with-extensions       Enable extensions (dirs in extensions/)],
   [ MOZ_EXTENSIONS=""
     for option in `echo $withval | sed 's/,/ /g'`; do
       if test "$option" = "yes" || test "$option" = "all"; then
-        MOZ_EXTENSIONS="$MOZ_EXTENSIONS cookie irc wallet xmlextras xmlterm psm-glue xml-rpc"
+        MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_DEFAULT irc xmlterm"
       elif test "$option" = "no" || test "$option" = "none"; then
         MOZ_EXTENSIONS=""
       elif test "$option" = "default"; then