From d09ed950d862ecc3de61037f08fb7d422cb88a9c Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 12 Feb 2003 19:56:53 +0000 Subject: [PATCH] supplimental fix for #192074. removing mozilla/mailnews/absync from the tree. r=cls, this bug has a=asa git-svn-id: svn://10.0.0.236/trunk@137726 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/build/unix/modules.mk | 4 +--- mozilla/config/config.mk | 5 ++--- mozilla/config/module2dir.pl | 1 - .../staticmod/macbuild/nsMetaModule_mail.cpp | 4 ---- mozilla/tools/module-deps/all.dot | 19 ------------------- 5 files changed, 3 insertions(+), 30 deletions(-) diff --git a/mozilla/build/unix/modules.mk b/mozilla/build/unix/modules.mk index 934521fb1c8..4391c5de3a5 100644 --- a/mozilla/build/unix/modules.mk +++ b/mozilla/build/unix/modules.mk @@ -43,7 +43,7 @@ ifneq ($(BUILD_MODULES),all) #### Generated lines go after this line. # Available modules are: -# TestStreamConv TestXPC TestXPTC absyncsvc accessibility accessproxy addrbook appcomps apprunner appshell autoconfig browser caps chardet chrome commandhandler composer content cookie dbm docshell dom downloadmanager editor embed_base embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkxtbin helperAppDlg htmlparser i18n iiextras imgbmp imggif imgjpeg imglib2 imgmng imgpng imgppm imgxbm impComm4xMail impText import inspector intl jar java jpeg js jsconsole jsdebug jsloader jsurl layout libart_lgpl libreg liveconnect locale lwbrk mailnews mime mimeemitter mimetype mng mork mozldap mpfilelocprovider msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime necko necko2 nkcache nkdatetime nkfinger npsimple oji p3p plugin png pref prefetch prefmigr profile progressDlg rdf rdfutil regviewer shistory sidebar string svg_doc test_necko timebombgen transformiix txmgr txtsvc typeaheadfind uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util vcard view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests widget windowwatcher xlibrgb xml-rpc xmlextras xmlterm xpcom xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xremoteservice xul xuldoc xultmpl zlib +# TestStreamConv TestXPC TestXPTC accessibility accessproxy addrbook appcomps apprunner appshell autoconfig browser caps chardet chrome commandhandler composer content cookie dbm docshell dom downloadmanager editor embed_base embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkxtbin helperAppDlg htmlparser i18n iiextras imgbmp imggif imgjpeg imglib2 imgmng imgpng imgppm imgxbm impComm4xMail impText import inspector intl jar java jpeg js jsconsole jsdebug jsloader jsurl layout libart_lgpl libreg liveconnect locale lwbrk mailnews mime mimeemitter mimetype mng mork mozldap mpfilelocprovider msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime necko necko2 nkcache nkdatetime nkfinger npsimple oji p3p plugin png pref prefetch prefmigr profile progressDlg rdf rdfutil regviewer shistory sidebar string svg_doc test_necko timebombgen transformiix txmgr txtsvc typeaheadfind uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util vcard view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests widget windowwatcher xlibrgb xml-rpc xmlextras xmlterm xpcom xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xremoteservice xul xuldoc xultmpl zlib BM_DIRS_TestStreamConv = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build netwerk/streamconv/test BM_CVS_TestStreamConv = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build netwerk/streamconv/test @@ -57,8 +57,6 @@ BM_DIRS_TestXPTC = modules/libreg string xpcom BM_CVS_TestXPTC = modules/libreg string xpcom -BM_DIRS_absyncsvc = mailnews js/src/fdlibm js/src modules/libreg string xpcom embedding/components/windowwatcher sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src intl webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil intl/lwbrk xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build expat htmlparser security/manager/ssl mailnews/local mailnews/imap mailnews/db/msgdb mailnews/import mailnews/addrbook mailnews/compose mailnews/extensions/smime mailnews/mime mailnews/news mailnews/base mailnews/base/util mailnews/absync -BM_CVS_absyncsvc = mailnews js/src/fdlibm js/src modules/libreg string xpcom embedding/components/windowwatcher sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src intl webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil intl/lwbrk xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build expat htmlparser security/manager/ssl mailnews/local mailnews/imap mailnews/db/msgdb mailnews/import mailnews/addrbook mailnews/compose mailnews/extensions/smime mailnews/mime mailnews/news mailnews/base mailnews/base/util mailnews/absync BM_DIRS_accessibility = js/src/fdlibm js/src modules/libreg string xpcom expat intl netwerk/cache intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar embedding/components/windowwatcher modules/libimg/png jpeg modules/libpr0n/public modules/libpr0n/src xpfe/components/shistory webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build profile/pref-migrator view content/xul/content content/xul/templates content/xul/document rdf/chrome profile editor/composer editor/txmgr embedding/components/commandhandler editor editor/txtsvc embedding/components/jsconsole xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader modules/libutil content gfx modules/oji layout htmlparser intl/chardet intl/uconv intl/unicharutil intl/locale xpfe/components/xremote widget caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build xpfe/components/sidebar dom accessible diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 49a8ee106b3..94a6a0fb441 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -393,19 +393,18 @@ MOZ_META_COMPONENTS_mail += \ nsMimeEmitterModule \ nsMsgComposeModule \ local_mail_services \ - nsAbSyncModule \ nsComm4xMailImportModule \ $(NULL) ifdef USE_SHORT_LIBNAME -MOZ_META_COMPONENTS_mail_comps += emitter msgcompo msglocal absyncsv +MOZ_META_COMPONENTS_mail_comps += emitter msgcompo msglocal ifeq ($(OS_ARCH),WINNT) MOZ_META_COMPONENTS_mail_comps += impComm4xMail else MOZ_META_COMPONENTS_mail_comps += imp4Mail endif else -MOZ_META_COMPONENTS_mail_comps += mimeemitter msgcompose localmail absyncsvc impComm4xMail +MOZ_META_COMPONENTS_mail_comps += mimeemitter msgcompose localmail impComm4xMail endif ifdef MOZ_PSM diff --git a/mozilla/config/module2dir.pl b/mozilla/config/module2dir.pl index eabb4c2c784..432d5331589 100755 --- a/mozilla/config/module2dir.pl +++ b/mozilla/config/module2dir.pl @@ -22,7 +22,6 @@ END_USAGE } my %map = ( - 'absyncsvc', 'mailnews/absync', 'access-proxy', 'extensions/access-builtin/accessproxy', 'accessibility', 'accessible', 'addrbook', 'mailnews/addrbook', diff --git a/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp b/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp index d416178481e..bb6fc1d9309 100644 --- a/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp +++ b/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp @@ -69,8 +69,6 @@ struct nsModuleComponentInfoContainer { extern nsModuleComponentInfo* nsMsgComposeModule_NSGM_comps; extern PRUint32 nsMsgComposeModule_NSGM_comp_count; extern "C" nsresult local_mail_services_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo* local_mail_services_NSGM_comps; extern PRUint32 local_mail_services_NSGM_comp_count; - extern "C" nsresult nsAbSyncModule_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); - extern nsModuleComponentInfo* nsAbSyncModule_NSGM_comps; extern PRUint32 nsAbSyncModule_NSGM_comp_count; extern "C" nsresult nsImportServiceModule_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo* nsImportServiceModule_NSGM_comps; extern PRUint32 nsImportServiceModule_NSGM_comp_count; extern "C" nsresult nsTextImportModule_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); @@ -96,7 +94,6 @@ NS_RegisterMetaModules(nsIComponentManager *aCompMgr, REGISTER_MODULE_USING(nsMsgNewsModule_NSGetModule); REGISTER_MODULE_USING(nsMsgComposeModule_NSGetModule); REGISTER_MODULE_USING(local_mail_services_NSGetModule); - REGISTER_MODULE_USING(nsAbSyncModule_NSGetModule); REGISTER_MODULE_USING(nsImportServiceModule_NSGetModule); REGISTER_MODULE_USING(nsTextImportModule_NSGetModule); REGISTER_MODULE_USING(nsAbModule_NSGetModule); @@ -172,7 +169,6 @@ static nsModuleComponentInfoContainer componentsList[] = { { nsMsgNewsModule_NSGM_comps, nsMsgNewsModule_NSGM_comp_count }, { nsMsgComposeModule_NSGM_comps, nsMsgComposeModule_NSGM_comp_count }, { local_mail_services_NSGM_comps, local_mail_services_NSGM_comp_count }, - { nsAbSyncModule_NSGM_comps, nsAbSyncModule_NSGM_comp_count }, { nsImportServiceModule_NSGM_comps, nsImportServiceModule_NSGM_comp_count }, { nsTextImportModule_NSGM_comps, nsTextImportModule_NSGM_comp_count }, { nsAbModule_NSGM_comps, nsAbModule_NSGM_comp_count }, diff --git a/mozilla/tools/module-deps/all.dot b/mozilla/tools/module-deps/all.dot index a6cb621c17b..81b2485d86c 100644 --- a/mozilla/tools/module-deps/all.dot +++ b/mozilla/tools/module-deps/all.dot @@ -3,7 +3,6 @@ digraph G { TestStreamConv [style=filled]; TestXPC [style=filled]; TestXPTC [style=filled]; - absyncsvc [style=filled]; accessibility [style=filled]; accessproxy [style=filled]; addrbook [style=filled]; @@ -879,24 +878,6 @@ digraph G { gtkembedmoz -> webbrwsr; gtkembedmoz -> layout; gtkembedmoz -> docshell; - absyncsvc -> xpcom; - absyncsvc -> addrbook; - absyncsvc -> msgbase; - absyncsvc -> uriloader; - absyncsvc -> docshell; - absyncsvc -> necko; - absyncsvc -> string; - absyncsvc -> intl; - absyncsvc -> mork; - absyncsvc -> mime; - absyncsvc -> mimetype; - absyncsvc -> pref; - absyncsvc -> dom; - absyncsvc -> msgbaseutil; - absyncsvc -> widget; - absyncsvc -> windowwatcher; - absyncsvc -> unicharutil; - absyncsvc -> rdf; xultmpl -> dom; xultmpl -> htmlparser; xultmpl -> widget;