Create a new xpcom obsolete library (and component library).

  Moved nsFileSpec and related classes into this obsolete library.
  Moved nsRegistry and related libreg functionality into the obsolete library.

Updated many callers using the obsolete nsFile spec to use nsIFile and Necko to do file IO.

Combined the following DLLs (source -> dest)
  uriloader -> docshell
  shistory -> docshell
  jsurl -> jsdom
  gkview -> gklayout

Moved nsAdapterEnumerator out of xpcom/ds and into mailnews, since they're the only consumer

Modifed the xpt_link tool so that you can specify a �only include� cid list that can mask CID�s that you are not interested in.

Added build options:
Prevent the building of xpinstall (--disable-xpinstall)
Prevent the building js component loader (--disable-jsloader)
A build option to only build a single profile (--enable-single-profile)
A build flag to only built the required xpfe components (--disable-xpfe-components).

Removal or hiding of unused functions and classes including nsEscape*, nsDequeIterator, nsRecyclingAllocatorImpl, nsDiscriminatedUnion, nsOpaqueKey, nsCRT::strlen, NS_NewCommandLineService

Bug 194240, r/sr = darin, alec.

Author: dougt%netscape.com

Makefile.in

@@ -128,6 +128,7 @@ tier_2_dirs	+= \
 		modules/libreg \
 		string \
 		xpcom \
+		xpcom/obsolete \
 		$(NULL)
 
 ifdef NS_TRACE_MALLOC
@@ -184,6 +185,7 @@ tier_9_dirs	+= \
 		content \
 		layout \
 		db \
+		xpfe/components/shistory \
 		docshell \
 		webshell \
 		profile \
@@ -206,7 +208,11 @@ ifdef MOZ_JPROF
 tier_9_dirs        += tools/jprof
 endif
 
-tier_9_dirs	+= xpfe xpinstall
+tier_9_dirs	+= xpfe
+
+ifdef MOZ_XPINSTALL
+tier_9_dirs     +=  xpinstall
+endif
 
 ifdef MOZ_LEAKY
 tier_9_dirs        += tools/leaky

allmakefiles.sh

@@ -177,6 +177,7 @@ intl/uconv/ucvtw/Makefile
 intl/uconv/ucvtw2/Makefile
 intl/uconv/ucvko/Makefile
 intl/uconv/ucvibm/Makefile
+intl/uconv/native/Makefile
 intl/locale/Makefile
 intl/locale/public/Makefile
 intl/locale/idl/Makefile
@@ -337,6 +338,7 @@ MAKEFILES_libreg="
 modules/libreg/Makefile
 modules/libreg/include/Makefile
 modules/libreg/src/Makefile
+modules/libreg/standalone/Makefile
 "
 
 MAKEFILES_libpref="
@@ -585,6 +587,8 @@ xpcom/reflect/xptinfo/Makefile
 xpcom/reflect/xptinfo/public/Makefile
 xpcom/reflect/xptinfo/src/Makefile
 xpcom/reflect/xptinfo/tests/Makefile
+xpcom/obsolete/Makefile
+xpcom/obsolete/component/Makefile
 xpcom/proxy/Makefile
 xpcom/proxy/public/Makefile
 xpcom/proxy/src/Makefile

build/mac/build_scripts/MozillaBuildList.pm

@@ -851,6 +851,8 @@ sub BuildClientDist()
 
     #LIBREG
     InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",                "$distdirectory:libreg:");
+    InstallFromManifest(":mozilla:modules:libreg:xpcom:MANIFEST",                  "$distdirectory:mozreg:");
+    InstallFromManifest(":mozilla:modules:libreg:xpcom:MANIFEST_IDL",              "$distdirectory:idl:");
 
     #STRING
     InstallFromManifest(":mozilla:string:public:MANIFEST",                         "$distdirectory:string:");
@@ -1427,6 +1429,7 @@ sub BuildIDLProjects()
     	BuildIDLProject(":mozilla:security:manager:boot:macbuild:pipbootIDL.xml",		"pipboot");
     }
 
+    BuildIDLProject(":mozilla:modules:libreg:xpcom:macbuild:mozregIDL.xml",         "mozreg");    
     BuildIDLProject(":mozilla:modules:libpref:macbuild:libprefIDL.xml",             "libpref");
     BuildIDLProject(":mozilla:modules:libutil:macbuild:libutilIDL.xml",             "libutil");
     BuildIDLProject(":mozilla:modules:libjar:macbuild:libjarIDL.xml",               "libjar");
@@ -1701,6 +1704,7 @@ sub BuildCommonProjects()
 
     BuildOneProject(":mozilla:modules:libreg:macbuild:libreg.xml",              "libreg$D.shlb", 1, $main::ALIAS_SYM_FILES, 0);
     BuildOneProject(":mozilla:xpcom:macbuild:xpcomPPC.xml",                     "xpcom$D.shlb", 1, $main::ALIAS_SYM_FILES, 0);
+    BuildOneProject(":mozilla:modules:libreg:xpcom:macbuild:mozreg.xml",        "mozreg$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
     BuildOneProject(":mozilla:js:macbuild:JavaScript.xml",                      "JavaScript$D.shlb", 1, $main::ALIAS_SYM_FILES, 0); 
     BuildOneProject(":mozilla:js:macbuild:LiveConnect.xml",                     "LiveConnect$D.$S", 1, $main::ALIAS_SYM_FILES, 0);
 

chrome/src/nsChromeRegistry.cpp

@@ -44,8 +44,6 @@
 
 #include <string.h>
 #include "nsCOMPtr.h"
-#include "nsIFileSpec.h"
-#include "nsSpecialSystemDirectory.h"
 #include "nsIChromeRegistry.h"
 #include "nsChromeRegistry.h"
 #include "nsChromeUIDataSource.h"

config/autoconf.mk.in

@@ -87,6 +87,10 @@ ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 SUNCTL = @SUNCTL@
 ACCESSIBILITY = @ACCESSIBILITY@
+MOZ_XPINSTALL = @MOZ_XPINSTALL@
+MOZ_JSLOADER  = @MOZ_JSLOADER@
+MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
+MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
@@ -96,6 +100,9 @@ MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
+MOZ_JSLOADER = @MOZ_JSLOADER@
+MOZ_XPINSTALL = @MOZ_XPINSTALL@
+MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
 
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
 MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
@@ -289,6 +296,7 @@ NSPR_LIBS	= @NSPR_LIBS@
 LDAP_CFLAGS	= @LDAP_CFLAGS@
 LDAP_LIBS	= @LDAP_LIBS@
 XPCOM_GLUE_LIBS	= @XPCOM_GLUE_LIBS@
+MOZ_XPCOM_OBSOLETE_LIBS = @MOZ_XPCOM_OBSOLETE_LIBS@
 
 
 # UNIX98 iconv support

configure.in

@@ -498,6 +498,7 @@ XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
 
 MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
 MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)'
+MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat'
 
 _PLATFORM_DEFAULT_TOOLKIT=gtk
 MOZ_WIDGET_TOOLKIT_LDFLAGS='-lwidget_$(MOZ_WIDGET_TOOLKIT)'
@@ -1034,6 +1035,7 @@ case "$target" in
         XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
         MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
         MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)'
+        MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib'
     fi
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
@@ -1259,6 +1261,7 @@ case "$target" in
         AC_DEFINE(OS2EMX_PLAIN_CHAR)
         MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/lib $(NSPR_LIBS)'
         MOZ_COMPONENT_XPCOM_LIBS='-L$(DIST)/lib $(DIST)/lib/xpcom.lib'
+        MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib $(DIST)/lib/xpcom_compat.lib'
         XPCOM_LIBS='-L$(DIST)/lib -lxpcom'
         MOZ_JS_LIBS='$(DIST)/lib/libmozjs.lib'
         MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/libxpcom.lib'
@@ -1305,6 +1308,7 @@ case "$target" in
         MKCSHLIB='$(LD) $(DSO_LDOPTS)'
         MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
         MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
+        MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib'
         XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
         MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
         MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
@@ -3372,6 +3376,57 @@ if test "$ACCESSIBILITY"; then
     AC_DEFINE(ACCESSIBILITY)
 fi
 
+dnl ========================================================
+dnl xpfe/components on by default
+dnl ========================================================
+MOZ_XPFE_COMPONENTS=1
+MOZ_ARG_DISABLE_BOOL(xpfe-components,
+[  --disable-xpfe-components    Disable xpfe components],
+    MOZ_XPFE_COMPONENTS= )
+
+dnl ========================================================
+dnl xpinstall support on by default
+dnl ========================================================
+MOZ_XPINSTALL=1
+MOZ_ARG_DISABLE_BOOL(xpinstall,
+[  --disable-xpinstall Disable xpinstall support],
+    MOZ_XPINSTALL= )
+if test "$MOZ_XPINSTALL"; then
+    AC_DEFINE(MOZ_XPINSTALL)
+fi
+
+dnl ========================================================
+dnl Single profile support off by default
+dnl ========================================================
+MOZ_SINGLE_PROFILE=
+MOZ_ARG_ENABLE_BOOL(single-profile,
+[  --enable-single-profile Enable single profile support ],
+    MOZ_SINGLE_PROFILE=1,
+    MOZ_SINGLE_PROFILE= )
+
+dnl ========================================================
+dnl xpcom js loader support on by default
+dnl ========================================================
+MOZ_JSLOADER=1
+MOZ_ARG_DISABLE_BOOL(jsloader,
+[  --disable-jsloader Disable xpcom js loader support],
+    MOZ_JSLOADER= )
+if test "$MOZ_JSLOADER"; then
+    AC_DEFINE(MOZ_JSLOADER)
+fi
+
+dnl ========================================================
+dnl use native unicode converters
+dnl ========================================================
+MOZ_USE_NATIVE_UCONV=
+MOZ_ARG_ENABLE_BOOL(native-uconv,
+[  --enable-native-uconv enable iconv support],
+    MOZ_USE_NATIVE_UCONV=1 )
+if test "$MOZ_USE_NATIVE_UCONV"; then
+    AC_DEFINE(MOZ_USE_NATIVE_UCONV)
+fi
+
+
 dnl ========================================================
 dnl Libeditor can be build as plaintext-only,
 dnl or as a full html and text editing component.
@@ -4590,8 +4645,10 @@ dnl = Cleanup section for misc ordering snafus
 dnl =
 if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC"; then
     XPCOM_GLUE_LIBS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX)'
+    MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/$(LIB_PREFIX)xpcom_compat.$(LIB_SUFFIX)'
 else
     XPCOM_GLUE_LIBS='-L${DIST}/bin -L${DIST}/lib -lxpcomglue -lstring_s -lstring_obsolete_s'
+    MOZ_XPCOM_OBSOLETE_LIBS='-L${DIST}/bin -L${DIST}/lib -lxpcom_compat'
 fi
 
 dnl ========================================================
@@ -4685,6 +4742,8 @@ AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_LEAKY)
 AC_SUBST(MOZ_JPROF)
 AC_SUBST(MOZ_XPCTOOLS)
+AC_SUBST(MOZ_JSLOADER)
+AC_SUBST(MOZ_USE_NATIVE_UCONV)
 AC_SUBST(MOZ_INSURE)
 AC_SUBST(MOZ_INSURE_DIRS)
 AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
@@ -4714,6 +4773,9 @@ AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(SUNCTL)
 AC_SUBST(ACCESSIBILITY)
+AC_SUBST(MOZ_XPINSTALL)
+AC_SUBST(MOZ_SINGLE_PROFILE)
+AC_SUBST(MOZ_XPFE_COMPONENTS)
 AC_SUBST(MOZ_USER_DIR)
 
 AC_SUBST(ENABLE_STRIP)
@@ -4722,6 +4784,7 @@ AC_SUBST(USE_PREBINDING)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
 AC_SUBST(MOZ_COMPONENT_XPCOM_LIBS)
+AC_SUBST(MOZ_XPCOM_OBSOLETE_LIBS)
 AC_SUBST(XPCOM_LIBS)
 
 AC_SUBST(MOZ_BUILD_ROOT)

content/html/content/src/nsFormSubmission.cpp

@@ -39,15 +39,12 @@
 
 // JBK added for submit move from content frame
 #include "nsIFile.h"
-#include "nsIFileStreams.h"
-#include "nsIFileSpec.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFormProcessor.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
-#include "nsSpecialSystemDirectory.h"
 #include "nsLinebreakConverter.h"
 #include "nsICharsetConverterManager.h"
 #include "xp_path.h"

content/xbl/src/nsXBLWindowHandler.cpp

@@ -57,6 +57,7 @@
 #include "nsIDOMEvent.h"
 #include "nsIContent.h"
 #include "nsHTMLAtoms.h"
+#include "nsXULAtoms.h"
 #include "nsINameSpaceManager.h"
 #include "nsIXBLDocumentInfo.h"
 #include "nsIDocument.h"

docshell/base/nsDocShell.cpp

@@ -59,6 +59,7 @@
 #include "nsContentPolicyUtils.h" // NS_CheckContentLoadPolicy(...)
 #include "nsICategoryManager.h"
 #include "nsXPCOMCID.h"
+#include "nsISeekableStream.h"
 
 // we want to explore making the document own the load group
 // so we can associate the document URI with the load group.
@@ -83,7 +84,6 @@
 #include "nsIWebProgress.h"
 #include "nsILayoutHistoryState.h"
 #include "nsITimer.h"
-#include "nsIFileStream.h"
 #include "nsISHistoryInternal.h"
 #include "nsIPrincipal.h"
 #include "nsIHistoryEntry.h"

docshell/base/nsWebShell.cpp

@@ -113,11 +113,11 @@ typedef unsigned long HMTX;
 #include "nsIController.h"
 #include "nsIFocusController.h"
 #include "nsGUIEvent.h"
-#include "nsIFileStream.h"
 #include "nsISHistoryInternal.h"
 
 #include "nsIHttpChannel.h"
 #include "nsIUploadChannel.h"
+#include "nsISeekableStream.h"
 
 #include "nsILocaleService.h"
 #include "nsIStringBundle.h"