Part of Bug 601573 - Support omnijar in Thunderbird; Part 1 - fix some resource url errors, adjust packaging manifest for different styles of chrome, and don't put mailViews.dat into omni.jar for now. r=sid0
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 06 Dec 2010 12:32:45 +0000
changeset 6797 d79b6317572498272fd194c52df65b6db6fb0184
parent 6796 a02c207dff032a746bd644753271ed852f5a23bc
child 6798 639c664ceb8f218657904fc10b1419ff597f3fae
push id5212
push userbugzilla@standard8.plus.com
push dateMon, 06 Dec 2010 12:33:15 +0000
treeherdercomm-central@d79b63175724 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssid0
bugs601573
Part of Bug 601573 - Support omnijar in Thunderbird; Part 1 - fix some resource url errors, adjust packaging manifest for different styles of chrome, and don't put mailViews.dat into omni.jar for now. r=sid0
mail/base/modules/quickFilterManager.js
mail/installer/Makefile.in
mail/installer/package-manifest.in
mail/locales/Makefile.in
--- a/mail/base/modules/quickFilterManager.js
+++ b/mail/base/modules/quickFilterManager.js
@@ -54,19 +54,19 @@ const FocusManager = Cc["@mozilla.org/fo
                        .getService(Ci.nsIFocusManager);
 
 const nsMsgSearchAttrib = Components.interfaces.nsMsgSearchAttrib;
 const nsMsgMessageFlags = Components.interfaces.nsMsgMessageFlags;
 const nsMsgSearchOp = Components.interfaces.nsMsgSearchOp;
 
 // XXX we need to know whether the gloda indexer is enabled for upsell reasons,
 // but this should really just be exposed on the main Gloda public interface.
-Cu.import("resource://app/modules/gloda/indexer.js");
+Cu.import("resource:///modules/gloda/indexer.js");
 // we need to be able to create gloda message searcher instances for upsells:
-Cu.import("resource://app/modules/gloda/msg_search.js");
+Cu.import("resource:///modules/gloda/msg_search.js");
 
 
 /**
  * Shallow object copy.
  */
 function shallowObjCopy(obj) {
   let newObj = {};
   for each (let [key, value] in Iterator(obj)) {
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -54,16 +54,22 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 	newsblog \
 	offline \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
+ifeq ($(MOZ_CHROME_FILE_FORMAT), jar)
+DEFINES += -DJAREXT=.jar
+else
+DEFINES += -DJAREXT=
+endif
+
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
@@ -84,16 +90,18 @@ MOZ_PKG_MAC_BACKGROUND=branding/backgrou
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 
 ifndef MOZ_ENABLE_LIBXUL
 $(error you need an "--enable-libxul" build to package a build)
 endif
 
+NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
+
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 ifdef MOZ_PKG_PRETTYNAMES
 libs::
 	$(MAKE) -C $(DEPTH)/mail/locales langpack-$(AB_CD)
 
 UPLOAD_EXTRA_FILES += $(LANGPACK)
 else
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -20,17 +20,17 @@
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Plug-Ins/
 @APPNAME@/Contents/Resources/
 @APPNAME@/Contents/Library/
 #endif
 
 [@AB_CD@]
-@BINPATH@/chrome/@AB_CD@.jar
+@BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
 @BINPATH@/@PREF_DIR@/all-l10n.js
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
@@ -64,17 +64,17 @@
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 
 ; Modules
 @BINPATH@/modules/*
 
 ; Optional RSS extension
 [newsblog]
-@BINPATH@/chrome/newsblog.jar
+@BINPATH@/chrome/newsblog@JAREXT@
 @BINPATH@/chrome/newsblog.manifest
 @BINPATH@/components/newsblog.js
 @BINPATH@/components/newsblog.manifest
 
 [mail]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
@@ -144,36 +144,36 @@
 #endif
 @BINPATH@/components/xpcom_base.xpt
 @BINPATH@/components/xpcom_system.xpt
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
 @BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/chrome/toolkit.jar
+@BINPATH@/chrome/toolkit@JAREXT@
 @BINPATH@/chrome/toolkit.manifest
-@BINPATH@/chrome/comm.jar
+@BINPATH@/chrome/comm@JAREXT@
 @BINPATH@/chrome/comm.manifest
-@BINPATH@/chrome/messenger.jar
+@BINPATH@/chrome/messenger@JAREXT@
 @BINPATH@/chrome/messenger.manifest
 #ifndef XP_UNIX
 @BINPATH@/chrome/icons/default/abcardWindow.ico
 @BINPATH@/chrome/icons/default/addressbookWindow.ico
 @BINPATH@/chrome/icons/default/messengerWindow.ico
 @BINPATH@/chrome/icons/default/msgcomposeWindow.ico
 #elifdef UNIX_BUT_NOT_MAC
 @BINPATH@/chrome/icons/default/*.png
 #endif
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 
 ; Gloda
-@BINPATH@/chrome/gloda.jar
+@BINPATH@/chrome/gloda@JAREXT@
 @BINPATH@/chrome/gloda.manifest
 @BINPATH@/components/glautocomp.js
 @BINPATH@/components/gloda.manifest
 @BINPATH@/components/jsmimeemitter.js
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Extensions (smime, etc.)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -200,17 +200,17 @@
 @BINPATH@/components/smime-service.js
 @BINPATH@/components/smime-service.manifest
 @BINPATH@/components/msgsmime.xpt
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Chrome Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-@BINPATH@/chrome/classic.jar
+@BINPATH@/chrome/classic@JAREXT@
 @BINPATH@/chrome/classic.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Default Profile Settings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; default pref files
 @BINPATH@/defaults/pref/all-thunderbird.js
@@ -517,17 +517,17 @@
 @BINPATH@/@DLL_PREFIX@softokn3.chk
 #endif
 #ifndef NSS_DISABLE_DBM
 @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
 #ifndef CROSS_COMPILE
 @BINPATH@/@DLL_PREFIX@nssdbm3.chk
 #endif
 #endif
-@BINPATH@/chrome/pippki.jar
+@BINPATH@/chrome/pippki@JAREXT@
 @BINPATH@/chrome/pippki.manifest
 
 ; for Solaris SPARC
 #ifdef SOLARIS
 @BINPATH@/@DLL_PREFIX@freebl_32fpu_3.chk
 @BINPATH@/@DLL_PREFIX@freebl_32fpu_3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@freebl_32int_3.chk
 @BINPATH@/@DLL_PREFIX@freebl_32int_3@DLL_SUFFIX@
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -80,16 +80,18 @@ ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
     $(NSINSTALL) -D $(STAGEDIST)/uninstall; \
     cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
     $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
     cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
     $(NULL)
 endif
 
+NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
+
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/mozilla/toolkit/locales/l10n.mk
 
 $(STAGEDIST): $(DIST)/branding
 
 $(DIST)/branding:
 	$(NSINSTALL) -D $@