Bug 514803 - Fix for new Date().toLocaleString() triggers "An error occured throwing an exception". Moved more charset files to jar r=bsmedberg

--HG--
extra : rebase_source : d501b6c2ec3ee7d6bd82949b30051e82c947b3fa

browser/installer/package-manifest.in

@@ -433,11 +433,6 @@
 @BINPATH@/res/entityTables/*
 #ifdef XP_MACOSX
 @BINPATH@/res/maccharset.properties
-@BINPATH@/res/MainMenu.nib/
-#elifdef XP_UNIX
-@BINPATH@/res/unixcharset.properties
-#elifdef XP_WIN32
-@BINPATH@/res/wincharset.properties
 #endif
 
 ; svg

browser/installer/removed-files.in

@@ -569,6 +569,10 @@ components/airbag.xpt
 components/nsUrlClassifierTable.js
 res/charsetalias.properties
 res/charsetData.properties
+res/os2charset.properties
+res/wincharset.properties
+res/maccharset.properties
+res/unixcharset.properties
 res/cmessage.txt
 res/html/gopher-audio.gif
 res/html/gopher-binary.gif

intl/uconv/src/Makefile.in

@@ -83,25 +83,17 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS			+= nsOS2Charset.cpp
-EXPORT_RESOURCE		+= os2charset.properties
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS			+= nsWinCharset.cpp
-EXPORT_RESOURCE		+= wincharset.properties
 else
 ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS			+= nsMacCharset.cpp
-EXPORT_RESOURCE		+= maccharset.properties
 else
 ifeq ($(OS_ARCH),BeOS)
 CPPSRCS			+= nsBeOSCharset.cpp
 else
 CPPSRCS			+= nsUNIXCharset.cpp
-EXPORT_RESOURCE		+= unixcharset.properties
-# add platform charset remapping properties files here if necessary
-# (see unixcharset.sample.properties for an example file)
-# eg: if we needed a charset remap for OSARCH=Linux then add the following line:
-#EXPORT_RESOURCE		+= unixcharset.Linux.properties
 endif
 endif
 endif
@@ -154,11 +146,4 @@ include $(topsrcdir)/config/rules.mk
 # nl_langinfo(CODESET) to compile on these systems.
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_XOPEN_SOURCE=500
-endif
-
-libs:: $(EXPORT_RESOURCE)
-	$(INSTALL) $^ $(DIST)/bin/res
-
-install:: $(EXPORT_RESOURCE)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res 
-
+endif

intl/uconv/src/jar.mn

@@ -1,3 +1,12 @@
 toolkit.jar:
         res/charsetalias.properties    (charsetalias.properties)
         res/charsetData.properties     (charsetData.properties)
+#ifdef XP_OS2
+        res/os2charset.properties     (os2charset.properties)
+#elifdef XP_WIN
+        res/wincharset.properties     (wincharset.properties)
+#elifdef XP_MAC
+        res/maccharset.properties     (maccharset.properties)
+#elifndef XP_BEOS
+        res/unixcharset.properties     (unixcharset.properties)
+#endif