Land STATIC_BUILD_20010612_BRANCH, which supports building mozilla with components statically linked into the executable, as well as 'meta modules' that combine components into uber-DLLs.

git-svn-id: svn://10.0.0.236/trunk@97613 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/build/nsLayoutModule.cpp

@@ -53,6 +53,8 @@
 #include "nsIContentSerializer.h"
 #include "nsIHTMLToTextSink.h"
 
+#include "nsIGenericFactory.h"
+
 // SVG
 #ifdef MOZ_SVG
 #include "nsSVGAtoms.h"
@@ -72,7 +74,8 @@
 
 static nsLayoutModule *gModule = NULL;
 
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
+extern "C" NS_EXPORT 
+nsresult NSGETMODULE_ENTRY_POINT(nsLayoutModule)(nsIComponentManager *servMgr,
                                           nsIFile* location,
                                           nsIModule** return_cobj)
 {
@@ -274,8 +277,10 @@ nsLayoutModule::RegisterSelf(nsIComponentManager *aCompMgr,
   Components* cp = gComponents;
   Components* end = cp + NUM_COMPONENTS;
   while (cp < end) {
-    rv = aCompMgr->RegisterComponentSpec(cp->mCID, cp->mDescription,
-                                         cp->mContractID, aPath, PR_TRUE, PR_TRUE);
+    rv = aCompMgr->RegisterComponentWithType(cp->mCID, cp->mDescription,
+                                             cp->mContractID, aPath, 
+                                             registryLocation, PR_TRUE, 
+                                             PR_TRUE, componentType);
     if (NS_FAILED(rv)) {
 #ifdef DEBUG
       printf("nsLayoutModule: unable to register %s component => %x\n",
@@ -286,7 +291,8 @@ nsLayoutModule::RegisterSelf(nsIComponentManager *aCompMgr,
     cp++;
   }
 
-  rv = RegisterDocumentFactories(aCompMgr, aPath);
+  rv = RegisterDocumentFactories(aCompMgr, aPath, registryLocation, 
+                                 componentType);
 
   return rv;
 }