bug 169003 - merge the mozbrwsr DLL into the appcomps DLL

r=bryner, sr=jag
2002-09-19 19:00:13 +00:00 · 2002-09-19 19:00:13 +00:00 · 54fd21de77
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@ -2201,8 +2201,6 @@ sub BuildXPAppProjects()

    # Applications
    BuildOneProject(":mozilla:xpfe:appshell:macbuild:AppShell.xml",             "AppShell$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
-    BuildOneProject(":mozilla:xpfe:browser:macbuild:mozBrowser.xml",            "mozBrowser$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
-
    EndBuildModule("xpapp");
 }

--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -27,9 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= browser
-LIBRARY_NAME	= mozbrwsr
+LIBRARY_NAME	= mozbrwsr_s
 EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
+FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsBrowserModule
 REQUIRES	= xpcom \
 		  string \
--- a/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/xpfe/browser/src/nsBrowserInstance.cpp
@ -87,7 +87,6 @@
 #include "nsAppShellCIDs.h"

 #include "nsIDocumentViewer.h"
-#include "nsICmdLineService.h"
 #include "nsIGlobalHistory.h"
 #include "nsIBrowserHistory.h"

@ -96,10 +95,8 @@
 #include "nsILocalFile.h"
 #include "nsIFileStreams.h"

-#include "nsCURILoader.h"
-#include "nsIContentHandler.h"
 #include "nsNetUtil.h"
-#include "nsICmdLineHandler.h"
+#include "nsICmdLineService.h"

 // Stuff to implement file download dialog.
 #include "nsFileStream.h"
@ -644,20 +641,6 @@ nsBrowserInstance::Close()
 // return DOM objects. And we need a dom window to bootstrap the browser
 /////////////////////////////////////////////////////////////////////////

-class nsBrowserContentHandler : public nsIContentHandler, public nsICmdLineHandler
-{
-public:
-  NS_DECL_NSICONTENTHANDLER
-  NS_DECL_NSICMDLINEHANDLER
-  NS_DECL_ISUPPORTS
-  CMDLINEHANDLER_REGISTERPROC_DECLS
-
-  nsBrowserContentHandler();
-  virtual ~nsBrowserContentHandler();
-
-protected:
-  PRBool NeedHomepageOverride(nsIPref *aPrefService);
-};

 NS_IMPL_ADDREF(nsBrowserContentHandler);
 NS_IMPL_RELEASE(nsBrowserContentHandler);
@ -846,132 +829,3 @@ NS_IMETHODIMP nsBrowserContentHandler::HandleContent(const char * aContentType,

  return NS_OK;
 }
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBrowserInstance, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserContentHandler)
-
-static const nsModuleComponentInfo components[] = {
-  { "nsBrowserInstance",
-    NS_BROWSERINSTANCE_CID,
-    NS_BROWSERINSTANCE_CONTRACTID, 
-    nsBrowserInstanceConstructor
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/html", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/vnd.mozilla.xul+xml", 
-    nsBrowserContentHandlerConstructor 
-  },
-#ifdef MOZ_SVG
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/svg+xml",
-    nsBrowserContentHandlerConstructor
-  },
-#endif
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/rdf", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/xml", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/xml", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/xhtml+xml", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/css", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/plain", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/gif", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/jpeg", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/jpg", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/png", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/bmp", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-icon", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"video/x-mng", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-jng", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-xbitmap", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Content Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/http-index-format", 
-    nsBrowserContentHandlerConstructor 
-  },
-  { "Browser Startup Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    NS_BROWSERSTARTUPHANDLER_CONTRACTID, 
-    nsBrowserContentHandlerConstructor,
-    nsBrowserContentHandler::RegisterProc,
-    nsBrowserContentHandler::UnregisterProc,
-  },
-  { "Chrome Startup Handler",
-    NS_BROWSERCONTENTHANDLER_CID,
-    "@mozilla.org/commandlinehandler/general-startup;1?type=chrome",
-    nsBrowserContentHandlerConstructor,
-  },
-  { NS_BROWSERSTATUSFILTER_CLASSNAME,
-    NS_BROWSERSTATUSFILTER_CID,
-    NS_BROWSERSTATUSFILTER_CONTRACTID,
-    nsBrowserStatusFilterConstructor
-  }
-  
-};
-
-NS_IMPL_NSGETMODULE(nsBrowserModule, components)
-
--- a/xpfe/browser/src/nsBrowserInstance.h
+++ b/xpfe/browser/src/nsBrowserInstance.h
@ -47,8 +47,13 @@
 #include "nscore.h"
 #include "nsISupports.h"

+// for nsBrowserStatusHandler
+#include "nsIContentHandler.h"
+#include "nsICmdLineHandler.h"
+
 class nsIDocShell;
 class nsIDOMWindowInternal;
+class nsIPref;

 ////////////////////////////////////////////////////////////////////////////////
 // nsBrowserInstance:
@ -89,4 +94,19 @@ class nsBrowserInstance : public nsIBrowserInstance,
 #endif
 };

+class nsBrowserContentHandler : public nsIContentHandler, public nsICmdLineHandler
+{
+public:
+  NS_DECL_NSICONTENTHANDLER
+  NS_DECL_NSICMDLINEHANDLER
+  NS_DECL_ISUPPORTS
+  CMDLINEHANDLER_REGISTERPROC_DECLS
+
+  nsBrowserContentHandler();
+  virtual ~nsBrowserContentHandler();
+
+protected:
+  PRBool NeedHomepageOverride(nsIPref *aPrefService);
+};
+
 #endif // nsBrowserInstance_h___
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -54,6 +54,7 @@ REQUIRES	= xpcom \
 		  webshell \
 		  appshell \
 		  history \
+		  browser \
 		  $(NULL)

 CPPSRCS		= nsModule.cpp
@ -79,6 +80,7 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)urlbarhistory_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)timebomb_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)windowds_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
 	$(NULL)

 LOCAL_INCLUDES	= \
@ -92,6 +94,7 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../timebomb          \
 	-I$(srcdir)/../urlbarhistory/src \
 	-I$(srcdir)/../windowds \
+	-I$(srcdir)/../../browser/src \
 	$(NULL)

 ifeq ($(OS_ARCH),WINNT)
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@ -61,6 +61,10 @@
 #include "nsLDAPAutoCompleteSession.h"
 #endif

+#include "nsBrowserStatusFilter.h"
+#include "nsBrowserInstance.h"
+#include "nsCURILoader.h"
+
 // Factory constructors
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteItem)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
@ -86,6 +90,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif

+NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBrowserInstance, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserContentHandler)
+
+
+    
 static NS_METHOD
 RegisterProc(nsIComponentManager *aCompMgr,
             nsIFile *aPath,
@ -202,6 +212,125 @@ static const nsModuleComponentInfo components[] = {
 	  "@mozilla.org/autocompleteSession;1?type=ldap",
 	  nsLDAPAutoCompleteSessionConstructor },
 #endif
+  { "nsBrowserInstance",
+    NS_BROWSERINSTANCE_CID,
+    NS_BROWSERINSTANCE_CONTRACTID, 
+    nsBrowserInstanceConstructor
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/html", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/vnd.mozilla.xul+xml", 
+    nsBrowserContentHandlerConstructor 
+  },
+#ifdef MOZ_SVG
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/svg+xml",
+    nsBrowserContentHandlerConstructor
+  },
+#endif
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/rdf", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/xml", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/xml", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/xhtml+xml", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/css", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/plain", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/gif", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/jpeg", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/jpg", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/png", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/bmp", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-icon", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"video/x-mng", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-jng", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-xbitmap", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Content Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/http-index-format", 
+    nsBrowserContentHandlerConstructor 
+  },
+  { "Browser Startup Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    NS_BROWSERSTARTUPHANDLER_CONTRACTID, 
+    nsBrowserContentHandlerConstructor,
+    nsBrowserContentHandler::RegisterProc,
+    nsBrowserContentHandler::UnregisterProc,
+  },
+  { "Chrome Startup Handler",
+    NS_BROWSERCONTENTHANDLER_CID,
+    "@mozilla.org/commandlinehandler/general-startup;1?type=chrome",
+    nsBrowserContentHandlerConstructor,
+  },
+  { NS_BROWSERSTATUSFILTER_CLASSNAME,
+    NS_BROWSERSTATUSFILTER_CID,
+    NS_BROWSERSTATUSFILTER_CONTRACTID,
+    nsBrowserStatusFilterConstructor
+  }
 };

 NS_IMPL_NSGETMODULE(application, components)
--- a/xpfe/components/macbuild/appcomps.xml
+++ b/xpfe/components/macbuild/appcomps.xml
--- a/xpinstall/packager/mac/browser.jst
+++ b/xpinstall/packager/mac/browser.jst
@ -20,6 +20,7 @@ function upgradeCleanup()
  deleteThisFile("Components", "pngdecoder2.shlb");
  deleteThisFile("Components", "bmpdecoder2.shlb");
  deleteThisFile("Components", "xbmdecoder2.shlb");
+  deleteThisFile("Components", "mozBrowser.shlb");
  deleteThisFile("Components", "Cache.shlb");
  deleteThisFile("Program",    "defaults/pref/config.js");
  deleteThisFile("Program",    "defaults/pref/initpref.js");
--- a/xpinstall/packager/os2/browser.jst
+++ b/xpinstall/packager/os2/browser.jst
@ -19,6 +19,7 @@ function upgradeCleanup()
  deleteThisFile("Components", "imgxbm.dll");
  deleteThisFile("Components", "imgppm.dll");
  deleteThisFile("Components", "nkcache.dll");
+  deleteThisFile("Components", "mozbrwsr.dll");
  deleteThisFile("Chrome",     "chrome.rdf");
  deleteThisFolder("Chrome",   "overlayinfo");
 }
--- a/xpinstall/packager/packages-mac
+++ b/xpinstall/packager/packages-mac
@ -147,7 +147,6 @@ viewer:Components:prefextras.xpt
 viewer:Components:libutil.xpt
 viewer:Components:lwbrk.shlb 
 viewer:Components:Mork.shlb 
-viewer:Components:mozBrowser.shlb 
 viewer:Components:mozBrowser.xpt 
 viewer:Components:mozcomps.xpt 
 viewer:Components:nsIStringBundle.xpt 
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@ -158,7 +158,6 @@ bin/components/layout_xul_tree.xpt
 bin/components/locale.xpt
 bin/components/lwbrk.dll
 bin/components/mork.dll
-bin/components/mozbrwsr.dll
 bin/components/mozbrwsr.xpt
 ;bin/components/mozcomps.xpt
 bin/components/mozfind.dll
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -120,7 +120,6 @@ bin/components/libimgmng.so
 bin/components/libjsurl.so
 bin/components/liblwbrk.so
 bin/components/libmork.so
-bin/components/libmozbrwsr.so
 bin/components/libmozfind.so
 bin/components/libnslocale.so
 bin/components/liboji.so
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@ -150,7 +150,6 @@ bin\components\layout_xul_tree.xpt
 bin\components\locale.xpt
 bin\components\lwbrk.dll
 bin\components\mork.dll
-bin\components\mozbrwsr.dll
 bin\components\mozbrwsr.xpt
 bin\components\mozcomps.xpt
 bin\components\mozfind.dll
--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@ -22,6 +22,7 @@ function upgradeCleanup()
  deleteThisFile("Components", "libimgbmp.so");
  deleteThisFile("Components", "libimgppm.so");
  deleteThisFile("Components", "libimgxbm.so");
+  deleteThisFile("Components", "libmozbrwsr.so");
  deleteThisFile("Components", "libnkcache.so");
  deleteThisFile("Program",    "defaults/pref/config.js");
  deleteThisFile("Program",    "defaults/pref/initpref.js");
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@ -494,6 +494,7 @@ function upgradeCleanup()
  deleteThisFile("Components", "imgbmp.dll");
  deleteThisFile("Components", "imgxbm.dll");
  deleteThisFile("Components", "imgppm.dll");
+  deleteThisFile("Components", "mozbrwsr.dll");
  deleteThisFile("Components", "nkcache.dll");
  deleteThisFile("Chrome",     "chrome.rdf");
  deleteThisFolder("Chrome",   "overlayinfo");