Bug 514803 - Fix for new Date().toLocaleString() triggers "An error occured throwing an exception". Moved more charset files to jar r=bsmedberg
authorTaras Glek <tglek@mozilla.com>
Mon, 14 Sep 2009 10:48:26 -0700
changeset 32509 e4f9964444752182cc593bac26999b0add2fc2d7
parent 32508 c5ef50d41b47b0ec88306e886fd7880072984956
child 32510 2ed1ef9eebf289ed66650605e4f9f6e78e871396
push id9132
push usertglek@mozilla.com
push dateTue, 15 Sep 2009 21:35:38 +0000
treeherdermozilla-central@e4f996444475 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs514803
milestone1.9.3a1pre
Bug 514803 - Fix for new Date().toLocaleString() triggers "An error occured throwing an exception". Moved more charset files to jar r=bsmedberg
browser/installer/package-manifest.in
browser/installer/removed-files.in
intl/uconv/src/Makefile.in
intl/uconv/src/jar.mn
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -428,21 +428,16 @@
 @BINPATH@/res/fonts/*
 @BINPATH@/res/dtd/*
 @BINPATH@/res/html/*
 @BINPATH@/res/langGroups.properties
 @BINPATH@/res/language.properties
 @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
 @BINPATH@/res/svg.css
 @BINPATH@/components/dom_svg.xpt
 #ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
 #endif
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -564,16 +564,20 @@ extensions/talkback@mozilla.org/componen
 extensions/talkback@mozilla.org/components/talkback/master.ini
 extensions/talkback@mozilla.org/components/talkback/talkback.so
 #endif
 #endif
 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
 res/html/gopher-find.gif
 res/html/gopher-image.gif
 res/html/gopher-menu.gif
 res/html/gopher-movie.gif
 res/html/gopher-sound.gif
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -78,35 +78,27 @@ CPPSRCS         += \
 		nsUnicodeToCP1252.cpp \
 		nsUnicodeToMacRoman.cpp \
 		$(NULL)
 
 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
 endif
 
 EXTRA_DSO_LDOPTS = \
 		../util/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) \
 		$(MOZ_UNICHARUTIL_LIBS) \
@@ -149,16 +141,9 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
 # CODESET is not automatically defined on some older versions of Redhat.
 # Define _XOPEN_SOURCE so CODESET will get defined and thus allow 
 # 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
\ No newline at end of file
--- a/intl/uconv/src/jar.mn
+++ b/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_MACOSX
+        res/maccharset.properties     (maccharset.properties)
+#elifndef XP_BEOS
+        res/unixcharset.properties     (unixcharset.properties)
+#endif