final not-part-of-build changes for bug 169498

add final constructors and fix the combined module to cover all 5 modules

intl/build/Makefile.in

@@ -34,8 +34,9 @@ REQUIRES	= xpcom \
 		  chardet \
 		  uconv \
 		  lwbrk \
-		  intl \
 		  unicharutil \
+		  intl \
+		  locale \
 		  htmlparser \
 		  content \
 		  widget \
@@ -47,16 +48,33 @@ CPPSRCS		= \
 			nsI18nModule.cpp \
 			$(NULL)
 
+# see also intl/locale/src/Makefile.in
+ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))
+LOCALE_DIR		= $(MOZ_WIDGET_TOOLKIT)
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
+LOCALE_DIR		= mac
+else
+LOCAlE_DIR		= unix
+endif
+endif
+
 LOCAL_INCLUDES = \
 			-I$(srcdir)/../chardet/src \
 			-I$(srcdir)/../lwbrk/src \
 			-I$(srcdir)/../unicharutil/src \
+			-I$(srcdir)/../strres/src \
+			-I$(srcdir)/../locale/src \
+			-I$(srcdir)/../locale/src/$(LOCALE_DIR) \
 			$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 			$(DIST)/lib/$(LIB_PREFIX)chardet_s.$(LIB_SUFFIX) \
 			$(DIST)/lib/$(LIB_PREFIX)lwbrk_s.$(LIB_SUFFIX) \
 			$(DIST)/lib/$(LIB_PREFIX)ucharucomp_s.$(LIB_SUFFIX) \
+			$(DIST)/lib/$(LIB_PREFIX)strres_s.$(LIB_SUFFIX) \
+			$(DIST)/lib/$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX) \
+			$(DIST)/lib/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \
 			$(NULL)
 
 EXTRA_DSO_LDOPTS = \

intl/build/nsI18nModule.cpp

@@ -50,6 +50,12 @@
 // unicharutil
 #include "nsUcharUtilConstructors.h"
 
+// string bundles (intl)
+#include "nsStrBundleConstructors.h"
+
+// locale
+#include "nsLocaleConstructors.h"
+
 static NS_METHOD
 AddCategoryEntry(const char* category,
                  const char* key,
@@ -294,6 +300,98 @@ static nsModuleComponentInfo components[] =
       NS_SAVEASCHARSET_CONTRACTID, nsSaveAsCharsetConstructor},
   { "Japanese Hankaku To Zenkaku", NS_HANKAKUTOZENKAKU_CID, 
       NS_HANKAKUTOZENKAKU_CONTRACTID, CreateNewHankakuToZenkaku},
+
+ // strres
+  { "String Bundle", NS_STRINGBUNDLESERVICE_CID, NS_STRINGBUNDLE_CONTRACTID, nsStringBundleServiceConstructor},
+
+ // locale
+  { "nsLocaleService component",
+    NS_LOCALESERVICE_CID,
+    NS_LOCALESERVICE_CONTRACTID,
+    CreateLocaleService },
+  { "Collation factory",
+    NS_COLLATIONFACTORY_CID,
+    NULL,
+    nsCollationFactoryConstructor },
+  { "Scriptable Date Format",
+    NS_SCRIPTABLEDATEFORMAT_CID,
+    NS_SCRIPTABLEDATEFORMAT_CONTRACTID,
+    NS_NewScriptableDateFormat },
+  { "Language Atom Service",
+    NS_LANGUAGEATOMSERVICE_CID,
+    NS_LANGUAGEATOMSERVICE_CONTRACTID,
+    nsLanguageAtomServiceConstructor },
+  { "Font Package Service",
+    NS_FONTPACKAGESERVICE_CID,
+    NS_FONTPACKAGESERVICE_CONTRACTID,
+    nsFontPackageServiceConstructor },
+ 
+#ifdef XP_WIN 
+  { "Platform locale",
+    NS_WIN32LOCALE_CID,
+    NS_WIN32LOCALE_CONTRACTID,
+    nsIWin32LocaleImplConstructor },
+  { "Collation",
+    NS_COLLATION_CID,
+    NULL,
+    nsCollationWinConstructor },
+  { "Date/Time formatter",
+    NS_DATETIMEFORMAT_CID,
+    NULL,
+    nsDateTimeFormatWinConstructor },
+#endif
+ 
+#ifdef XP_UNIX
+  { "Platform locale",
+    NS_POSIXLOCALE_CID,
+    NS_POSIXLOCALE_CONTRACTID,
+    nsPosixLocaleConstructor },
+
+  { "Collation",
+    NS_COLLATION_CID,
+    NULL,
+    nsCollationUnixConstructor },
+
+  { "Date/Time formatter",
+    NS_DATETIMEFORMAT_CID,
+    NULL,
+    nsDateTimeFormatUnixConstructor },
+#endif
+
+#ifdef XP_MAC
+  { "Mac locale",
+    NS_MACLOCALE_CID,
+    NS_MACLOCALE_CONTRACTID,
+    nsMacLocaleConstructor },
+  { "Collation",
+    NS_COLLATION_CID,
+    NULL,
+#ifdef USE_UCCOLLATIONKEY
+    nsCollationMacUCConstructor },
+#else
+    nsCollationMacConstructor },
+#endif
+  { "Date/Time formatter",
+    NS_DATETIMEFORMAT_CID,
+    NULL,
+    nsDateTimeFormatMacConstructor },
+#endif
+
+#ifdef XP_OS2
+  { "OS/2 locale",
+    NS_OS2LOCALE_CID,
+    NS_OS2LOCALE_CONTRACTID,
+    nsOS2LocaleConstructor },
+  { "Collation",
+    NS_COLLATION_CID,
+    NULL,
+    nsCollationOS2Constructor },
+  { "Date/Time formatter",
+    NS_DATETIMEFORMAT_CID,
+    NULL,
+    nsDateTimeFormatOS2Constructor },
+#endif
+      
 };
 
 

intl/locale/src/nsLocaleConstructors.h

@@ -75,8 +75,6 @@ ctor_(nsISupports* aOuter, REFNSIID aIID, void** aResult) \
 
 NSLOCALE_MAKE_CTOR(CreateLocaleService, nsILocaleService, NS_NewLocaleService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCollationFactory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCollationWin)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsDateTimeFormatWin)
 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableDateTimeFormat)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLanguageAtomService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageService)

intl/strres/src/nsStrBundleConstructors.h

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsStrBundleConstructors_h__
+#define nsStrBundleConstructors_h__
+
+#include "nsStringBundle.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStringBundleService, Init)
+
+#endif