From e69d6ac070442a7daa3e04eb6496700a4c77b485 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Mon, 27 Mar 2006 16:21:55 +0000 Subject: [PATCH] Bug 301249 - Checkout and build mozilla/dbm as part of NSS instead of the mozilla client, and pull NSS by the release tag instead of by the NSS_CLIENT_TAG which is now deprecated! r=dougt (+nelsonb) --- Makefile.in | 1 - allmakefiles.sh | 11 ----------- client.mk | 7 +++---- configure.in | 10 ---------- security/manager/Makefile.in | 11 ++--------- 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/Makefile.in b/Makefile.in index 283ea1ff35c..5e91eb8dc8e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,6 @@ tier_0_dirs = \ # # tier 1 - 3rd party individual libraries # -tier_1_dirs += dbm ifndef MOZ_NATIVE_JPEG tier_1_dirs += jpeg diff --git a/allmakefiles.sh b/allmakefiles.sh index 914df033dd6..1a3b517470b 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -96,13 +96,6 @@ storage/build/Makefile storage/test/Makefile " -MAKEFILES_dbm=" -dbm/Makefile -dbm/include/Makefile -dbm/src/Makefile -dbm/tests/Makefile -" - MAKEFILES_dom=" dom/Makefile dom/public/Makefile @@ -1580,7 +1573,6 @@ add_makefiles " $MAKEFILES_caps $MAKEFILES_chrome $MAKEFILES_db -$MAKEFILES_dbm $MAKEFILES_docshell $MAKEFILES_dom $MAKEFILES_editor @@ -1752,8 +1744,6 @@ MAKEFILES_content_packs="extensions/content-packs/Makefile" MAKEFILES_cookie="xpcom/Makefile xpcom/string/Makefile webshell/public/Makefile modules/libimg/png/Makefile js/src/fdlibm/Makefile js/src/Makefile js/src/xpconnect/Makefile ipc/ipcd/Makefile xpcom/obsolete/Makefile embedding/components/profilesharingsetup/Makefile modules/libpref/Makefile netwerk/cache/Makefile intl/uconv/native/Makefile widget/src/gtkxtbin/Makefile netwerk/mime/Makefile uriloader/base/Makefile embedding/components/windowwatcher/public/Makefile rdf/util/Makefile intl/unicharutil/Makefile parser/expat/Makefile modules/libutil/Makefile parser/htmlparser/Makefile rdf/Makefile profile/dirserviceprovider/Makefile docshell/shistory/Makefile embedding/components/webbrowserpersist/Makefile db/mdb/public/Makefile db/mork/src/Makefile db/mork/build/Makefile xpfe/browser/public/Makefile xpfe/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile directory/xpcom/base/Makefile editor/txmgr/Makefile xpfe/components/directory/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/related/public/Makefile xpfe/components/related/src/Makefile xpfe/components/intl/Makefile xpfe/components/windowds/Makefile xpfe/components/autocomplete/public/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile xpfe/components/urlbarhistory/public/Makefile xpfe/components/urlbarhistory/src/Makefile xpfe/components/build/Makefile xpfe/components/history/public/Makefile xpfe/components/history/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile profile/pref-migrator/Makefile profile/Makefile xpfe/appshell/Makefile xpfe/components/xremote/public/Makefile xpfe/components/xremote/Makefile widget/public/Makefile widget/src/Makefile view/Makefile editor/composer/public/Makefile intl/lwbrk/Makefile content/xul/content/Makefile content/xul/templates/Makefile content/xul/document/Makefile embedding/components/ui/helperAppDlg/Makefile embedding/components/find/Makefile embedding/components/commandhandler/Makefile editor/txtsvc/Makefile editor/Makefile uriloader/prefetch/Makefile docshell/Makefile embedding/components/jsconsole/public/Makefile embedding/base/Makefile embedding/components/windowwatcher/src/Makefile embedding/components/appstartup/src/Makefile embedding/components/jsconsole/src/Makefile embedding/components/printingui/src/unixshared/Makefile embedding/components/build/Makefile intl/chardet/public/Makefile intl/chardet/src/Makefile intl/uconv/Makefile intl/locale/Makefile accessible/Makefile netwerk/protocol/viewsource/Makefile netwerk/protocol/gopher/Makefile sun-java/Makefile modules/libjar/Makefile js/src/liveconnect/Makefile modules/oji/Makefile other-licenses/libart_lgpl/Makefile layout/Makefile rdf/chrome/src/Makefile rdf/chrome/build/Makefile content/Makefile gfx/src/xprintutil/Makefile gfx/src/xlibrgb/Makefile gfx/Makefile jpeg/Makefile modules/libpr0n/Makefile netwerk/Makefile intl/strres/Makefile uriloader/exthandler/Makefile modules/plugin/Makefile caps/Makefile dom/Makefile extensions/cookie/Makefile" -MAKEFILES_dbm="dbm/Makefile" - MAKEFILES_docshell="xpcom/Makefile xpcom/string/Makefile modules/libimg/png/Makefile intl/uconv/native/Makefile webshell/public/Makefile js/src/fdlibm/Makefile js/src/Makefile js/src/xpconnect/Makefile gfx/src/xprintutil/Makefile widget/src/gtkxtbin/Makefile embedding/components/windowwatcher/public/Makefile rdf/util/Makefile intl/unicharutil/Makefile parser/expat/Makefile modules/libutil/Makefile parser/htmlparser/Makefile rdf/Makefile ipc/ipcd/Makefile embedding/components/profilesharingsetup/Makefile profile/dirserviceprovider/Makefile db/mdb/public/Makefile db/mork/src/Makefile db/mork/build/Makefile docshell/shistory/Makefile xpfe/browser/public/Makefile xpfe/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile directory/xpcom/base/Makefile editor/txmgr/Makefile xpfe/components/directory/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/related/public/Makefile xpfe/components/related/src/Makefile xpfe/components/intl/Makefile xpfe/components/windowds/Makefile xpfe/components/autocomplete/public/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile xpfe/components/urlbarhistory/public/Makefile xpfe/components/urlbarhistory/src/Makefile xpfe/components/build/Makefile xpfe/components/history/public/Makefile xpfe/components/history/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile xpcom/obsolete/Makefile profile/pref-migrator/Makefile profile/Makefile xpfe/appshell/Makefile xpfe/components/xremote/public/Makefile xpfe/components/xremote/Makefile widget/public/Makefile widget/src/Makefile view/Makefile gfx/src/xlibrgb/Makefile gfx/Makefile intl/locale/Makefile intl/lwbrk/Makefile content/xul/content/Makefile content/xul/templates/Makefile content/xul/document/Makefile embedding/components/commandhandler/Makefile editor/composer/public/Makefile editor/txtsvc/Makefile editor/Makefile accessible/Makefile sun-java/Makefile modules/libjar/Makefile js/src/liveconnect/Makefile modules/oji/Makefile other-licenses/libart_lgpl/Makefile layout/Makefile uriloader/base/Makefile embedding/components/webbrowserpersist/Makefile embedding/components/find/Makefile embedding/components/jsconsole/public/Makefile embedding/base/Makefile embedding/components/windowwatcher/src/Makefile embedding/components/appstartup/src/Makefile embedding/components/jsconsole/src/Makefile embedding/components/printingui/src/unixshared/Makefile embedding/components/build/Makefile intl/chardet/public/Makefile intl/chardet/src/Makefile intl/uconv/Makefile netwerk/mime/Makefile netwerk/protocol/viewsource/Makefile netwerk/protocol/gopher/Makefile netwerk/Makefile intl/strres/Makefile modules/libpref/Makefile netwerk/cache/Makefile jpeg/Makefile modules/libpr0n/Makefile rdf/chrome/src/Makefile rdf/chrome/build/Makefile uriloader/prefetch/Makefile content/Makefile dom/Makefile embedding/components/ui/helperAppDlg/Makefile uriloader/exthandler/Makefile modules/plugin/Makefile caps/Makefile docshell/Makefile" MAKEFILES_dom="xpcom/Makefile xpcom/string/Makefile webshell/public/Makefile modules/libimg/png/Makefile js/src/fdlibm/Makefile js/src/Makefile js/src/xpconnect/Makefile ipc/ipcd/Makefile xpcom/obsolete/Makefile embedding/components/profilesharingsetup/Makefile modules/libpref/Makefile netwerk/cache/Makefile intl/uconv/native/Makefile widget/src/gtkxtbin/Makefile netwerk/mime/Makefile uriloader/base/Makefile embedding/components/windowwatcher/public/Makefile rdf/util/Makefile intl/unicharutil/Makefile parser/expat/Makefile modules/libutil/Makefile parser/htmlparser/Makefile rdf/Makefile profile/dirserviceprovider/Makefile docshell/shistory/Makefile embedding/components/webbrowserpersist/Makefile db/mdb/public/Makefile db/mork/src/Makefile db/mork/build/Makefile xpfe/browser/public/Makefile xpfe/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile directory/xpcom/base/Makefile editor/txmgr/Makefile xpfe/components/directory/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/related/public/Makefile xpfe/components/related/src/Makefile xpfe/components/intl/Makefile xpfe/components/windowds/Makefile xpfe/components/autocomplete/public/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile xpfe/components/urlbarhistory/public/Makefile xpfe/components/urlbarhistory/src/Makefile xpfe/components/build/Makefile xpfe/components/history/public/Makefile xpfe/components/history/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile profile/pref-migrator/Makefile profile/Makefile xpfe/appshell/Makefile xpfe/components/xremote/public/Makefile xpfe/components/xremote/Makefile widget/public/Makefile widget/src/Makefile view/Makefile editor/composer/public/Makefile intl/lwbrk/Makefile content/xul/content/Makefile content/xul/templates/Makefile content/xul/document/Makefile embedding/components/ui/helperAppDlg/Makefile embedding/components/find/Makefile embedding/components/commandhandler/Makefile editor/txtsvc/Makefile editor/Makefile uriloader/prefetch/Makefile docshell/Makefile embedding/components/jsconsole/public/Makefile embedding/base/Makefile embedding/components/windowwatcher/src/Makefile embedding/components/appstartup/src/Makefile embedding/components/jsconsole/src/Makefile embedding/components/printingui/src/unixshared/Makefile embedding/components/build/Makefile intl/chardet/public/Makefile intl/chardet/src/Makefile intl/uconv/Makefile intl/locale/Makefile accessible/Makefile netwerk/protocol/viewsource/Makefile netwerk/protocol/gopher/Makefile sun-java/Makefile modules/libjar/Makefile js/src/liveconnect/Makefile modules/oji/Makefile other-licenses/libart_lgpl/Makefile layout/Makefile rdf/chrome/src/Makefile rdf/chrome/build/Makefile content/Makefile gfx/src/xprintutil/Makefile gfx/src/xlibrgb/Makefile gfx/Makefile jpeg/Makefile modules/libpr0n/Makefile netwerk/Makefile intl/strres/Makefile uriloader/exthandler/Makefile modules/plugin/Makefile caps/Makefile dom/Makefile" @@ -2077,7 +2067,6 @@ MAKEFILES_zlib="modules/zlib/standalone/Makefile" content) add_makefiles "$MAKEFILES_content" ;; content-packs) add_makefiles "$MAKEFILES_content_packs" ;; cookie) add_makefiles "$MAKEFILES_cookie" ;; - dbm) add_makefiles "$MAKEFILES_dbm" ;; docshell) add_makefiles "$MAKEFILES_docshell" ;; dom) add_makefiles "$MAKEFILES_dom" ;; downloadmanager) add_makefiles "$MAKEFILES_downloadmanager" ;; diff --git a/client.mk b/client.mk index 3fda9ca7897..d2ba33ade3e 100644 --- a/client.mk +++ b/client.mk @@ -183,9 +183,6 @@ MODULES_core := \ mozilla/tools/test-harness \ $(NULL) -# Should be NSS, bug 301249 -MODULES_core += mozilla/dbm - LOCALES_core := \ netwerk \ dom \ @@ -366,7 +363,7 @@ MODULES_all := \ # and commit this file on that tag. #MOZ_CO_TAG = NSPR_CO_TAG = NSPRPUB_PRE_4_2_CLIENT_BRANCH -NSS_CO_TAG = NSS_CLIENT_TAG +NSS_CO_TAG = NSS_3_11_RTM LDAPCSDK_CO_TAG = ldapcsdk_50_client_branch LOCALES_CO_TAG = @@ -531,8 +528,10 @@ endif # MOZ_BUILD_PROJECTS # CVS defines for NSS # NSS_CO_MODULE = \ + mozilla/dbm \ mozilla/security/nss \ mozilla/security/coreconf \ + mozilla/security/dbm \ $(NULL) NSS_CO_FLAGS := -P diff --git a/configure.in b/configure.in index d212bfaf8cf..6a56af482a3 100644 --- a/configure.in +++ b/configure.in @@ -4907,16 +4907,6 @@ MOZ_ARG_DISABLE_BOOL(crypto, MOZ_PSM=, MOZ_PSM=1 ) -if test "$COMPILE_ENVIRONMENT"; then - case $target in - *-cygwin*|*-mingw*|*-msvc*|*-mks*|*-wince) - if test -n "$MOZ_PSM" -a ! -e "$AS_BIN"; then - AC_MSG_ERROR([Building crypto support requires a valid version of the standalone assembler (ml.exe for MSVC).]) - fi - ;; - esac -fi - dnl ======================================================== dnl = JS Debugger XPCOM component (js/jsd) dnl ======================================================== diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index 36f9dcd5851..ae252b90a95 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -117,7 +117,7 @@ FREEBL_64INT_CHK = libfreebl_64int_3.chk FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX) FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk endif - + ABS_DIST := $(shell cd $(DIST) && pwd) ifeq ($(HOST_OS_ARCH),WINNT) ifdef CYGDRIVE_MOUNT @@ -142,7 +142,6 @@ endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 DEFAULT_GMAKE_FLAGS += CC="$(CC)" -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES=-I$(ABS_DIST)/include/dbm DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR) @@ -241,13 +240,7 @@ endif libs:: ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) -endif -ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) -else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) -endif -ifndef MOZ_NATIVE_NSS + $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)