Bug 533043 - Use a single preprocessed packaging manifest for all three platforms, r=Standard8
authorPhil Ringnalda <philringnalda>
Sun, 13 Dec 2009 21:43:00 -0800
changeset 4578 c87ebb61ec415f9ba8a884ace4e5c8a8480df68f
parent 4577 1ae4759269e2a56e90c171f53743ecd58b9d89fe
child 4579 a0fec491cb2b9ec842336430e8b745ee0c3676fe
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs533043
Bug 533043 - Use a single preprocessed packaging manifest for all three platforms, r=Standard8
mail/installer/Makefile.in
mail/installer/package-manifest.in
mail/installer/windows/Makefile.in
mail/installer/windows/packages-static
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -54,37 +54,43 @@ NO_PKG_FILES = \
 	res/bloatcycle.html \
 	nspr-config \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
-ifeq (WINNT,$(OS_ARCH))
-MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
-endif
+MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
 	mail \
 	newsblog \
 	offline \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
+ifdef MOZ_ENABLE_GNOME_COMPONENT
+DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
+endif
+
+ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+DEFINES += -DMOZ_GTK2=1
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
-MOZ_PKG_MANIFEST = packages-static
+MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
@@ -104,25 +110,38 @@ endif
 endif
 
 # On mozilla-central, packager.mk uses core_abspath to redefine DIST
 # As the comm-central config.mk doesn't set it, do it ourselves instead
 core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
 
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
+ifeq (Darwin, $(OS_ARCH))
+BINPATH = $(_BINPATH)
+DEFINES += -DAPPNAME=$(_APPNAME)
+else
+BINPATH = bin
+endif
+DEFINES += -DBINPATH=$(BINPATH)
+
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
 PKGCOMP_FIND_OPTS = -L
 endif
+ifeq (Darwin, $(OS_ARCH))
+FINDPATH = $(_APPNAME)/Contents/MacOS
+else
+FINDPATH=bin
+endif
 
 package-compare::
 ifdef MOZ_PKG_MANIFEST_P
-	cd $(DIST); find $(PKGCOMP_FIND_OPTS) bin -type f | sort > bin-list.txt
-	grep "^bin" $(MOZ_PKG_MANIFEST) | sed -e 's/\\/\//g' | sort > $(DIST)/pack-list.txt
+	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
+	grep "^$(BINPATH)" $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
 	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer: removed-files
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif
new file mode 100644
--- /dev/null
+++ b/mail/installer/package-manifest.in
@@ -0,0 +1,773 @@
+; Package file for the Thunderbird build.
+;
+; File format:
+;
+; [] designates a toplevel component. Example: [xpcom]
+; * wildcard
+; ; file comment
+;
+
+#filter substitution
+
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+#define UNIX_BUT_NOT_MAC
+#endif
+#endif
+
+#ifdef XP_MACOSX
+; Mac bundle stuff
+@APPNAME@/Contents/Info.plist
+@APPNAME@/Contents/PkgInfo
+@APPNAME@/Contents/Plug-Ins/
+@APPNAME@/Contents/Resources/
+#endif
+
+[@AB_CD@]
+@BINPATH@/chrome/@AB_CD@.jar
+@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
+
+[xpcom]
+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+#elifdef XP_WIN32
+@BINPATH@/@DLL_PREFIX@js3250@DLL_SUFFIX@
+#else
+@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+#endif
+#ifdef XP_UNIX
+@BINPATH@/components/@DLL_PREFIX@jsd@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
+#endif
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
+#elifdef XP_WIN32
+@BINPATH@/components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
+#endif
+#ifdef XP_WIN32
+#ifndef MOZ_MEMORY
+@BINPATH@/Microsoft.VC80.CRT.manifest
+@BINPATH@/msvcm80.dll
+@BINPATH@/msvcp80.dll
+@BINPATH@/msvcr80.dll
+#else
+@BINPATH@/mozcrt19.dll
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/mozcpp19.dll
+#endif
+#endif
+#endif
+
+; Modules
+@BINPATH@/modules/
+
+; Optional RSS extension
+[newsblog]
+@BINPATH@/chrome/newsblog.jar
+@BINPATH@/chrome/newsblog.manifest
+@BINPATH@/components/newsblog.js
+
+[mail]
+#ifndef XP_UNIX
+@BINPATH@/@MOZ_APP_NAME@.exe
+#else
+@BINPATH@/@MOZ_APP_NAME@-bin
+#ifndef XP_MACOSX
+@BINPATH@/@MOZ_APP_NAME@
+#endif
+#endif
+@BINPATH@/application.ini
+@BINPATH@/platform.ini
+@BINPATH@/README.txt
+#ifdef MOZILLA_1_9_2_BRANCH
+@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
+#else
+@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+#endif
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/run-mozilla.sh
+@BINPATH@/icons/*.png
+#endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Mail Specific Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+@BINPATH@/defaults/messenger/mailViews.dat
+@BINPATH@/defaults/profile/localstore.rdf
+@BINPATH@/defaults/profile/prefs.js
+@BINPATH@/defaults/profile/mimeTypes.rdf
+
+@BINPATH@/isp/
+
+@BINPATH@/components/components.list
+@BINPATH@/components/aboutRights.js
+@BINPATH@/components/activity.xpt
+@BINPATH@/components/addrbook.xpt
+@BINPATH@/components/fts3tok.xpt
+@BINPATH@/components/mime.xpt
+@BINPATH@/components/steel.xpt
+@BINPATH@/components/msgAsyncPrompter.js
+@BINPATH@/components/msgbase.xpt
+#ifdef XP_WIN32
+@BINPATH@/components/msgcompo.xpt
+#else
+@BINPATH@/components/msgcompose.xpt
+#endif
+@BINPATH@/components/msgdb.xpt
+@BINPATH@/components/msgimap.xpt
+@BINPATH@/components/msglocal.xpt
+@BINPATH@/components/msgnews.xpt
+@BINPATH@/components/msgsearch.xpt
+@BINPATH@/components/import.xpt
+@BINPATH@/components/impComm4xMail.xpt
+@BINPATH@/components/mailview.xpt
+@BINPATH@/components/mailprofilemigration.xpt
+@BINPATH@/components/nsActivity.js
+@BINPATH@/components/nsActivityManager.js
+@BINPATH@/components/nsActivityManagerUI.js
+@BINPATH@/components/nsMailNewsCommandLineHandler.js
+@BINPATH@/components/shellservice.xpt
+@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
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/xpcom_threads.xpt
+#elifdef XP_WIN32
+@BINPATH@/components/xpcom_thread.xpt
+#else
+@BINPATH@/components/xpcom_threads.xpt
+#endif
+@BINPATH@/components/xpcom_xpti.xpt
+@BINPATH@/chrome/toolkit.jar
+@BINPATH@/chrome/toolkit.manifest
+@BINPATH@/chrome/comm.jar
+@BINPATH@/chrome/comm.manifest
+@BINPATH@/chrome/messenger.jar
+@BINPATH@/chrome/messenger.manifest
+#ifdef XP_WIN32
+@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/*.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.manifest
+@BINPATH@/components/glautocomp.js
+@BINPATH@/components/jsmimeemitter.js
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Mail Extensions (smime, etc.)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+#ifdef XP_WIN32
+@BINPATH@/MapiProxy.dll
+@BINPATH@/mozMapi32.dll
+@BINPATH@/components/mapihook.xpt
+#endif
+@BINPATH@/components/mailContentHandler.js
+@BINPATH@/components/nsMailDefaultHandler.js
+@BINPATH@/components/nsSetDefaultMail.js
+@BINPATH@/components/offlineStartup.js
+@BINPATH@/components/steelApplication.js
+
+
+@BINPATH@/components/mdn-service.js
+
+@BINPATH@/components/smime-service.js
+@BINPATH@/components/msgsmime.xpt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Chrome Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+@BINPATH@/chrome/classic.jar
+@BINPATH@/chrome/classic.manifest
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Default Profile Settings
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; default pref files
+@BINPATH@/defaults/pref/all-thunderbird.js
+@BINPATH@/defaults/pref/channel-prefs.js
+@BINPATH@/defaults/pref/composer.js
+@BINPATH@/defaults/pref/mailnews.js
+@BINPATH@/defaults/pref/mdn.js
+@BINPATH@/defaults/pref/smime.js
+@BINPATH@/defaults/pref/thunderbird-branding.js
+#ifdef MOZILLA_1_9_2_BRANCH
+@BINPATH@/greprefs/
+#else
+@BINPATH@/greprefs.js
+#endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; App extensions to Mail
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; LDAP components
+@BINPATH@/components/mozldap.xpt
+@BINPATH@/components/nsAbLDAPAttributeMap.js
+@BINPATH@/components/nsLDAPProtocolHandler.js
+#ifdef XP_WIN32
+@BINPATH@/nsldap32v60@DLL_SUFFIX@
+@BINPATH@/nsldappr32v60@DLL_SUFFIX@
+@BINPATH@/nsldif32v60@DLL_SUFFIX@
+#else
+@BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
+#endif
+
+; login manager
+@BINPATH@/components/loginmgr.xpt
+@BINPATH@/components/nsLoginInfo.js
+@BINPATH@/components/nsLoginManager.js
+@BINPATH@/components/nsLoginManagerPrompter.js
+@BINPATH@/components/storage-Legacy.js
+@BINPATH@/components/storage-mozStorage.js
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/crypto-SDR.js
+#endif
+
+; download progress
+@BINPATH@/components/nsHelperAppDlg.js
+@BINPATH@/components/nsDownloadManagerUI.js
+@BINPATH@/components/nsProgressDialog.js
+@BINPATH@/components/downloads.xpt
+
+; Protocol/Content handling
+@BINPATH@/components/nsContentDispatchChooser.js
+@BINPATH@/components/nsHandlerService.js
+@BINPATH@/components/nsWebHandlerApp.js
+@BINPATH@/components/nsSMTPProtocolHandler.js
+
+; spellchecker (may not be present)
+@BINPATH@/components/spellchecker.xpt
+
+; xpinstall (needed to dynamically install themes
+@BINPATH@/components/xpinstall.xpt
+
+; misson control, autoconfig
+@BINPATH@/defaults/autoconfig/platform.js
+@BINPATH@/defaults/autoconfig/prefcalls.js
+@BINPATH@/components/autoconfig.xpt
+
+; Phishing Protection
+@BINPATH@/components/nsPhishingProtectionApplication.js
+@BINPATH@/components/nsUrlClassifierListManager.js
+@BINPATH@/components/nsUrlClassifierLib.js
+@BINPATH@/components/url-classifier.xpt
+
+; Address Book autocomplete
+@BINPATH@/components/nsAbAutoCompleteMyDomain.js
+@BINPATH@/components/nsAbAutoCompleteSearch.js
+
+; Windows Search integration
+; the module is included as part of the "Modules" rule
+#ifdef XP_WIN32
+@BINPATH@/components/mailwinsearch.xpt
+@BINPATH@/WSEnable.exe
+#endif
+
+; Bayesian trait analysis
+@BINPATH@/components/nsMsgTraitService.js
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Base Package Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; xpconnect
+@BINPATH@/components/xpconnect.xpt
+
+; XP widgets/graphics
+@BINPATH@/components/widget.xpt
+#ifdef XP_MACOSX
+@BINPATH@/components/widget_cocoa.xpt
+#endif
+@BINPATH@/components/gfx.xpt
+
+; layout
+@BINPATH@/components/content_base.xpt
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/content_canvas.xpt
+#endif
+@BINPATH@/components/content_events.xpt
+@BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_htmldoc.xpt
+@BINPATH@/components/content_xmldoc.xpt
+@BINPATH@/components/content_xslt.xpt
+@BINPATH@/components/content_xtf.xpt
+@BINPATH@/components/contentprefs.xpt
+@BINPATH@/components/htmlparser.xpt
+@BINPATH@/components/layout_base.xpt
+@BINPATH@/components/layout_printing.xpt
+@BINPATH@/components/layout_xul.xpt
+@BINPATH@/components/xulapp.xpt
+@BINPATH@/components/xuldoc.xpt
+@BINPATH@/components/xultmpl.xpt
+
+@BINPATH@/components/inspector.xpt
+
+; Imaging:
+@BINPATH@/components/imgicon.xpt
+@BINPATH@/components/imglib2.xpt
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
+#endif
+
+; accessibility (out of process API support)
+#ifdef ACCESSIBILITY
+@BINPATH@/components/accessibility.xpt
+#ifdef XP_WIN32
+@BINPATH@/components/accessibility-msaa.xpt
+@BINPATH@/AccessibleMarshal.dll
+#endif
+#endif
+
+; caps (JavaScript security)
+@BINPATH@/components/caps.xpt
+
+; glue: appshell, docshell, uriloader, chrome, components
+@BINPATH@/components/appshell.xpt
+@BINPATH@/components/appstartup.xpt
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/docshell.xpt
+#elifdef XP_WIN32
+@BINPATH@/components/docshell_base.xpt
+#else
+@BINPATH@/components/docshell.xpt
+#endif
+@BINPATH@/components/uriloader.xpt
+@BINPATH@/components/webBrowser_core.xpt
+@BINPATH@/components/windowwatcher.xpt
+@BINPATH@/components/webbrowserpersist.xpt
+@BINPATH@/components/commandhandler.xpt
+#ifdef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/mozbrwsr.xpt
+#endif
+
+; jar
+@BINPATH@/components/jar.xpt
+
+; prefs
+@BINPATH@/components/pref.xpt
+
+; profile
+@BINPATH@/components/profile.xpt
+@BINPATH@/components/toolkitprofile.xpt
+
+; toolkit
+@BINPATH@/components/commandlines.xpt
+@BINPATH@/components/chrome.xpt
+@BINPATH@/components/nsDefaultCLH.js
+@BINPATH@/components/nsFormAutoComplete.js
+#ifdef XP_MACOSX
+@BINPATH@/components/libalerts_s.dylib
+#elifdef XP_UNIX
+@BINPATH@/components/toolkitremote.xpt
+@BINPATH@/mozilla-xremote-client
+#endif
+#ifdef MOZ_GTK2
+@BINPATH@/components/filepicker.xpt
+@BINPATH@/components/nsFilePicker.js
+#endif
+#ifdef MOZ_ENABLE_DBUS
+@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+#endif
+
+; rdf
+@BINPATH@/components/rdf.xpt
+
+; required i18n libraries
+@BINPATH@/components/intl.xpt
+@BINPATH@/components/locale.xpt
+@BINPATH@/components/uconv.xpt
+@BINPATH@/components/unicharutil.xpt
+
+; dom
+@BINPATH@/components/dom.xpt
+@BINPATH@/components/dom_base.xpt
+@BINPATH@/components/dom_canvas.xpt
+@BINPATH@/components/dom_core.xpt
+@BINPATH@/components/dom_css.xpt
+@BINPATH@/components/dom_events.xpt
+@BINPATH@/components/dom_geolocation.xpt
+@BINPATH@/components/dom_html.xpt
+@BINPATH@/components/dom_json.xpt
+@BINPATH@/components/dom_offline.xpt
+@BINPATH@/components/dom_range.xpt
+@BINPATH@/components/dom_sidebar.xpt
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/dom_smil.xpt
+#endif
+@BINPATH@/components/dom_storage.xpt
+@BINPATH@/components/dom_stylesheets.xpt
+@BINPATH@/components/dom_threads.xpt
+@BINPATH@/components/dom_traversal.xpt
+@BINPATH@/components/dom_views.xpt
+@BINPATH@/components/dom_xbl.xpt
+@BINPATH@/components/dom_xul.xpt
+@BINPATH@/components/dom_loadsave.xpt
+@BINPATH@/components/NetworkGeolocationProvider.js
+@BINPATH@/components/GPSDGeolocationProvider.js
+
+; editor / composer for HTML compose
+@BINPATH@/components/editor.xpt
+@BINPATH@/components/composer.xpt
+@BINPATH@/components/txmgr.xpt
+
+; find functionality
+@BINPATH@/components/txtsvc.xpt
+
+; moz storage
+@BINPATH@/components/storage.xpt
+
+; netwerk
+@BINPATH@/components/necko.xpt
+@BINPATH@/components/necko_about.xpt
+@BINPATH@/components/necko_dns.xpt
+@BINPATH@/components/necko_http.xpt
+@BINPATH@/components/necko_res.xpt
+@BINPATH@/components/necko_strconv.xpt
+@BINPATH@/components/necko_file.xpt
+@BINPATH@/components/necko_ftp.xpt
+@BINPATH@/components/necko_cache.xpt
+@BINPATH@/components/necko_cookie.xpt
+@BINPATH@/components/necko_socket.xpt
+@BINPATH@/components/necko_viewsource.xpt
+@BINPATH@/components/necko_wifi.xpt
+@BINPATH@/components/nsProxyAutoConfig.js
+
+; extensions
+@BINPATH@/components/nsAddonRepository.js
+@BINPATH@/components/nsExtensionManager.js
+@BINPATH@/components/nsBlocklistService.js
+#ifdef MOZ_UPDATER
+@BINPATH@/components/nsUpdateService.js
+@BINPATH@/components/nsUpdateServiceStub.js
+#endif
+@BINPATH@/components/nsUpdateTimerManager.js
+@BINPATH@/components/extensions.xpt
+@BINPATH@/components/update.xpt
+#ifdef MOZ_WEBSERVICES
+@BINPATH@/components/websrvcs.xpt
+#endif
+@BINPATH@/components/nsURLFormatter.js
+@BINPATH@/components/urlformatter.xpt
+@BINPATH@/components/nsContentPrefService.js
+
+; plugins
+@BINPATH@/components/plugin.xpt
+
+; [Personal Security Manager]
+@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
+@BINPATH@/components/pipboot.xpt
+@BINPATH@/components/pipnss.xpt
+@BINPATH@/components/pippki.xpt
+@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
+#ifndef CROSS_COMPILE
+@BINPATH@/@DLL_PREFIX@freebl3.chk
+@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.manifest
+
+
+; core platform files
+@BINPATH@/components/FeedProcessor.js
+@BINPATH@/components/xpautocomplete.xpt
+@BINPATH@/components/autocomplete.xpt
+@BINPATH@/components/alerts.xpt
+@BINPATH@/components/jsdservice.xpt
+@BINPATH@/components/fastfind.xpt
+@BINPATH@/components/find.xpt
+@BINPATH@/components/chardet.xpt
+@BINPATH@/components/jsconsole-clhandler.js
+@BINPATH@/components/layout_xul_tree.xpt
+@BINPATH@/components/mozfind.xpt
+@BINPATH@/components/mimetype.xpt
+@BINPATH@/components/parentalcontrols.xpt
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/proxyObject.xpt
+#elifndef XP_WIN32
+@BINPATH@/components/proxyObjInst.xpt
+#else
+@BINPATH@/components/proxyObject.xpt
+#endif
+@BINPATH@/components/exthandler.xpt
+@BINPATH@/components/exthelper.xpt
+@BINPATH@/components/embed_base.xpt
+@BINPATH@/components/webshell_idls.xpt
+@BINPATH@/components/windowds.xpt
+@BINPATH@/components/dom_xpath.xpt
+@BINPATH@/components/lwbrk.xpt
+@BINPATH@/components/nsTryToClose.js
+@BINPATH@/components/pluginGlue.js
+@BINPATH@/components/txEXSLTRegExFunctions.js
+@BINPATH@/components/feeds.xpt
+@BINPATH@/components/saxparser.xpt
+@BINPATH@/components/satchel.xpt
+@BINPATH@/components/shistory.xpt
+@BINPATH@/components/zipwriter.xpt
+@BINPATH@/components/nsBadCertHandler.js
+@BINPATH@/components/cookie.xpt
+@BINPATH@/components/places.xpt
+@BINPATH@/components/prefetch.xpt
+
+#ifdef MOZILLA_1_9_2_BRANCH
+@BINPATH@/res/arrow.gif
+@BINPATH@/res/arrowd.gif
+@BINPATH@/res/broken-image.png
+@BINPATH@/res/charsetData.properties
+@BINPATH@/res/charsetalias.properties
+@BINPATH@/res/forms.css
+@BINPATH@/res/hiddenWindow.html
+@BINPATH@/res/html.css
+@BINPATH@/res/loading-image.png
+@BINPATH@/res/mathml.css
+@BINPATH@/res/quirk.css
+@BINPATH@/res/ua.css
+@BINPATH@/res/viewsource.css
+#ifdef XP_WIN32
+@BINPATH@/res/wincharset.properties
+#elifdef XP_MACOSX
+@BINPATH@/res/maccharset.properties
+#elifdef XP_OS2
+@BINPATH@/res/os2charset.properties
+#else
+@BINPATH@/res/unixcharset.properties
+#endif
+#endif
+@BINPATH@/res/langGroups.properties
+@BINPATH@/res/language.properties
+@BINPATH@/res/entityTables/
+@BINPATH@/res/dtd/
+@BINPATH@/res/fonts/
+@BINPATH@/res/contenteditable.css
+@BINPATH@/res/designmode.css
+@BINPATH@/res/html/folder.png
+#ifdef XP_MACOSX
+@BINPATH@/res/cursors/
+@BINPATH@/res/MainMenu.nib/
+#endif
+
+; editor resource files
+@BINPATH@/res/EditorOverride.css
+@BINPATH@/res/grabber.gif
+@BINPATH@/res/table-add-column-after-active.gif
+@BINPATH@/res/table-add-column-after-hover.gif
+@BINPATH@/res/table-add-column-after.gif
+@BINPATH@/res/table-add-column-before-active.gif
+@BINPATH@/res/table-add-column-before-hover.gif
+@BINPATH@/res/table-add-column-before.gif
+@BINPATH@/res/table-add-row-after-active.gif
+@BINPATH@/res/table-add-row-after-hover.gif
+@BINPATH@/res/table-add-row-after.gif
+@BINPATH@/res/table-add-row-before-active.gif
+@BINPATH@/res/table-add-row-before-hover.gif
+@BINPATH@/res/table-add-row-before.gif
+@BINPATH@/res/table-remove-column-active.gif
+@BINPATH@/res/table-remove-column-hover.gif
+@BINPATH@/res/table-remove-column.gif
+@BINPATH@/res/table-remove-row-active.gif
+@BINPATH@/res/table-remove-row-hover.gif
+@BINPATH@/res/table-remove-row.gif
+
+; svg
+@BINPATH@/res/svg.css
+@BINPATH@/components/dom_svg.xpt
+
+; [Updater]
+#ifdef XP_MACOSX
+@BINPATH@/updater.app/
+#else
+@BINPATH@/updater@BIN_SUFFIX@
+#endif
+
+; [crash reporter]
+#ifdef XP_MACOSX
+@BINPATH@/crashreporter.app/
+#else
+@BINPATH@/crashreporter@BIN_SUFFIX@
+@BINPATH@/crashreporter.ini
+#ifdef XP_UNIX
+@BINPATH@/Throbber-small.gif
+#endif
+#endif
+
+; GNOME hooks
+#ifdef MOZ_ENABLE_GNOME_COMPONENT
+@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+#endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; For packaging shared test builds
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+#ifndef MOZ_STATIC_BUILD
+#ifdef ACCESSIBILITY
+@BINPATH@/components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@appcomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@auth@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@caps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@chardet@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@chrome@DLL_SUFFIX@
+#ifndef MOZILLA_1_9_2_BRANCH
+@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
+#ifdef XP_WIN32
+@BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
+#elifdef XP_WIN32
+@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@composer@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@cookie@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@docshell@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@embedcomponents@DLL_SUFFIX@
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@fileview@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@gkgfxthebes@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@gklayout@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@gkplugin@DLL_SUFFIX@
+#ifdef XP_UNIX
+#ifdef XP_MACOSX
+@BINPATH@/components/@DLL_PREFIX@widget_mac@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@widget_gtk2@DLL_SUFFIX@
+#endif
+#else
+@BINPATH@/components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@i18n@DLL_SUFFIX@
+#ifndef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@import@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@jar50@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@jsctypes@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mail@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mork@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@mozldap@DLL_SUFFIX@
+#ifdef XP_WIN32
+@BINPATH@/components/@DLL_PREFIX@msgMapi@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@msgsmime@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@necko@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@pipboot@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@pipnss@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@pippki@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@rdf@DLL_SUFFIX@
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@remoteservice@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@satchel@DLL_SUFFIX@
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@system-pref@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@txmgr@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@uconv@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@ucvmath@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@universalchardet@DLL_SUFFIX@
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+@BINPATH@/components/@DLL_PREFIX@unixproxy@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@osxproxy@DLL_SUFFIX@
+#endif
+#else
+@BINPATH@/components/@DLL_PREFIX@windowsproxy@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@webbrwsr@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@windowds@DLL_SUFFIX@
+#ifdef XP_WIN32
+@BINPATH@/components/@DLL_PREFIX@xpc3250@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@xppref32@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@xpconnect@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@pref@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@zipwriter@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@gkgfx@DLL_SUFFIX@
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/@DLL_PREFIX@gfxpsshar@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@gtkxtbin@DLL_SUFFIX@
+#endif
+@BINPATH@/@DLL_PREFIX@mozz@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@thebes@DLL_SUFFIX@
+#ifdef XP_MACOSX
+@BINPATH@/XUL
+#else
+@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+#endif
+#endif
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -51,20 +51,16 @@ SFX_MODULE = $(topsrcdir)/other-licenses
 DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
 PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py $(MOZ_APP_VERSION))
 DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
-PP_LOCALIZED_FILES = \
-	packages-static \
-	$(NULL)
-
 # All script and locale files used by the Unicode version of NSIS need to be
 # converted from UTF-8 to UTF-16LE
 INSTALLER_FILES_CONV = \
 	nsis/installer.nsi \
 	nsis/uninstaller.nsi \
 	nsis/shared.nsh \
 	$(NULL)
  
@@ -108,20 +104,16 @@ uninstaller::
 	done
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	for i in $(BRANDING_FILES_CONV); do \
 	  iconv -f UTF-8 -t UTF-16LE $(DIST)/branding/$$i | \
 	    cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	    $(CONFIG_DIR)/$$i; \
 	done
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(EXIT_ON_ERROR) \
-	for i in $(PP_LOCALIZED_FILES); do \
-	  $(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
-	done
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in | iconv -f UTF-8 -t UTF-16LE | \
 	  cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	  $(CONFIG_DIR)/defines.nsi
 	$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
 	  $(MOZILLA_SRCDIR) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer $(AB_CD) \
 	  $(CONFIG_DIR)
 
@@ -134,20 +126,16 @@ uninstaller::
 	done
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	for i in $(BRANDING_FILES_CONV); do \
 	  iconv -f UTF-8 -t UTF-16LE $(DIST)/branding/$$i | \
 	    cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	    $(CONFIG_DIR)/$$i; \
 	done
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(EXIT_ON_ERROR) \
-	for i in $(PP_LOCALIZED_FILES); do \
-	  $(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
-	done
 ifeq ($(CONFIG_DIR),instgen)
 	$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/make-installremoves.pl \
 	  ../removed-files > $(CONFIG_DIR)/removed-files.log
 endif
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in | iconv -f UTF-8 -t UTF-16LE | \
 	  cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	  $(CONFIG_DIR)/defines.nsi
deleted file mode 100644
--- a/mail/installer/windows/packages-static
+++ /dev/null
@@ -1,574 +0,0 @@
-#filter substitution
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Base Thunderbird Package File for Win32
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[@AB_CD@]
-bin\chrome\@AB_CD@.jar
-bin\chrome\@AB_CD@.manifest
-bin\defaults\pref\all-l10n.js
-bin\dictionaries\*
-bin\uninstall\helper.exe
-bin\update.locale
-bin\updater.ini
-bin\isp\@AB_CD@\*
-
-[xpcom]
-bin\xpcom.dll
-bin\xpcom_core.dll
-bin\nspr4.dll
-bin\plc4.dll
-bin\plds4.dll
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\js3250.dll
-#else
-bin\mozjs.dll
-#endif
-bin\components\jsd3250.dll
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\components\xpinstal.dll
-#else
-bin\components\xpinstall.dll
-#endif
-#ifndef MOZ_MEMORY
-bin\Microsoft.VC80.CRT.manifest
-bin\msvcm80.dll
-bin\msvcp80.dll
-bin\msvcr80.dll
-#else
-bin\mozcrt19.dll
-#ifndef MOZILLA_1_9_2_BRANCH
-bin\mozcpp19.dll
-#endif
-#endif
-
-; Modules
-bin\modules\*
-bin\modules\gloda\*
-bin\modules\activity\*
-
-; Optional RSS extension
-[newsblog]
-bin\chrome\newsblog.jar
-bin\chrome\newsblog.manifest
-bin\components\newsblog.js
-
-[mail]
-
-bin\thunderbird.exe
-bin\application.ini
-bin\platform.ini
-bin\README.txt
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\sqlite3.dll
-#else
-bin\mozsqlite3.dll
-#endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Specific Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-bin\defaults\messenger\mailViews.dat
-bin\defaults\profile\localstore.rdf
-bin\defaults\profile\prefs.js
-bin\defaults\profile\mimeTypes.rdf
-
-bin\isp\*
-
-bin\components\components.list
-bin\components\aboutRights.js
-bin\components\activity.xpt
-bin\components\addrbook.xpt
-bin\components\fts3tok.xpt
-bin\components\mime.xpt
-bin\components\steel.xpt
-bin\components\msgAsyncPrompter.js
-bin\components\msgbase.xpt
-bin\components\msgcompo.xpt
-bin\components\msgdb.xpt
-bin\components\msgimap.xpt
-bin\components\msglocal.xpt
-bin\components\msgnews.xpt
-bin\components\msgsearch.xpt
-bin\components\import.xpt
-bin\components\impComm4xMail.xpt
-bin\components\mailview.xpt
-bin\components\mailprofilemigration.xpt
-bin\components\nsActivity.js
-bin\components\nsActivityManager.js
-bin\components\nsActivityManagerUI.js
-bin\components\nsMailNewsCommandLineHandler.js
-bin\components\shellservice.xpt
-bin\components\xpcom_base.xpt
-bin\components\xpcom_system.xpt
-bin\components\xpcom_components.xpt
-bin\components\xpcom_ds.xpt
-bin\components\xpcom_io.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\components\xpcom_thread.xpt
-#else
-bin\components\xpcom_threads.xpt
-#endif
-bin\components\xpcom_xpti.xpt
-bin\chrome\toolkit.jar
-bin\chrome\toolkit.manifest
-bin\chrome\comm.jar
-bin\chrome\comm.manifest
-bin\chrome\pippki.jar
-bin\chrome\pippki.manifest
-bin\chrome\messenger.jar
-bin\chrome\messenger.manifest
-bin\chrome\icons\default\abcardWindow.ico
-bin\chrome\icons\default\addressbookWindow.ico
-bin\chrome\icons\default\messengerWindow.ico
-bin\chrome\icons\default\msgcomposeWindow.ico
-bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
-bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\icon.png
-bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\preview.png
-
-; Gloda
-bin\chrome\gloda.jar
-bin\chrome\gloda.manifest
-bin\components\glautocomp.js
-bin\components\jsmimeemitter.js
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Extensions (smime, etc.)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-bin\MapiProxy.dll
-bin\mozMapi32.dll
-bin\components\mailContentHandler.js
-bin\components\mapihook.xpt
-bin\components\nsMailDefaultHandler.js
-bin\components\nsSetDefaultMail.js
-bin\components\offlineStartup.js
-bin\components\steelApplication.js
-
-
-bin\components\mdn-service.js
-
-bin\components\smime-service.js
-bin\components\msgsmime.xpt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Chrome Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-bin\chrome\classic.jar
-bin\chrome\classic.manifest
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Default Profile Settings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; default pref files
-bin\defaults\pref\all-thunderbird.js
-bin\defaults\pref\channel-prefs.js
-bin\defaults\pref\composer.js
-bin\defaults\pref\mailnews.js
-bin\defaults\pref\mdn.js
-bin\defaults\pref\smime.js
-bin\defaults\pref\thunderbird-branding.js
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\greprefs\*
-#else
-bin\greprefs.js
-#endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; App extensions to Mail
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; LDAP components
-bin\components\mozldap.xpt
-bin\components\nsAbLDAPAttributeMap.js
-bin\components\nsLDAPProtocolHandler.js
-bin\nsldap32v60.dll
-bin\nsldappr32v60.dll
-bin\nsldif32v60.dll
-
-; login manager
-bin\components\loginmgr.xpt
-bin\components\nsLoginInfo.js
-bin\components\nsLoginManager.js
-bin\components\nsLoginManagerPrompter.js
-bin\components\storage-Legacy.js
-bin\components\storage-mozStorage.js
-#ifndef MOZILLA_1_9_2_BRANCH
-bin\components\crypto-SDR.js
-#endif
-
-; download progress
-bin\components\nsHelperAppDlg.js
-bin\components\nsDownloadManagerUI.js
-bin\components\nsProgressDialog.js
-bin\components\downloads.xpt
-
-; Protocol/Content handling
-bin\components\nsContentDispatchChooser.js
-bin\components\nsHandlerService.js
-bin\components\nsWebHandlerApp.js
-bin\components\nsSMTPProtocolHandler.js
-
-; spellchecker (may not be present)
-bin\components\spellchecker.xpt
-
-; xpinstall (needed to dynamically install themes
-bin\components\xpinstall.xpt
-
-; misson control, autoconfig
-bin\defaults\autoconfig\platform.js
-bin\defaults\autoconfig\prefcalls.js
-bin\components\autoconfig.xpt
-
-; Phishing Protection
-bin\components\nsPhishingProtectionApplication.js
-bin\components\nsUrlClassifierListManager.js
-bin\components\nsUrlClassifierLib.js
-bin\components\url-classifier.xpt
-
-; Address Book autocomplete
-bin\components\nsAbAutoCompleteMyDomain.js
-bin\components\nsAbAutoCompleteSearch.js
-
-; Windows Search integration
-; the module is included as part of the "Modules" rule
-bin\components\mailwinsearch.xpt
-bin\WSEnable.exe
-
-; Bayesian trait analysis
-bin\components\nsMsgTraitService.js
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Base Package Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; xpconnect
-bin\components\xpconnect.xpt
-
-; XP widgets/graphics
-bin\components\widget.xpt
-bin\components\gfx.xpt
-
-; layout
-bin\components\content_base.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
-bin\components\content_canvas.xpt
-#endif
-bin\components\content_events.xpt
-bin\components\content_html.xpt
-bin\components\content_htmldoc.xpt
-bin\components\content_xmldoc.xpt
-bin\components\content_xslt.xpt
-bin\components\content_xtf.xpt
-bin\components\contentprefs.xpt
-bin\components\htmlparser.xpt
-bin\components\layout_base.xpt
-bin\components\layout_printing.xpt
-bin\components\layout_xul.xpt
-bin\components\xulapp.xpt
-bin\components\xuldoc.xpt
-bin\components\xultmpl.xpt
-
-bin\components\inspector.xpt
-
-; Imaging:
-bin\components\imgicon.xpt
-bin\components\imglib2.xpt
-
-; accessibility (out of process API support)
-bin\components\accessibility.xpt
-bin\components\accessibility-msaa.xpt
-
-; caps (JavaScript security)
-bin\components\caps.xpt
-
-; glue: appshell, docshell, uriloader, chrome, components
-bin\components\appshell.xpt
-bin\components\appstartup.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\components\docshell_base.xpt
-#else
-bin\components\docshell.xpt
-#endif
-bin\components\uriloader.xpt
-bin\components\webBrowser_core.xpt
-bin\components\windowwatcher.xpt
-bin\components\webbrowserpersist.xpt
-bin\components\commandhandler.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\components\mozbrwsr.xpt
-#endif
-
-; jar
-bin\components\jar.xpt
-
-; prefs
-bin\components\pref.xpt
-
-; profile
-bin\components\profile.xpt
-bin\components\toolkitprofile.xpt
-
-; toolkit
-bin\components\commandlines.xpt
-bin\components\chrome.xpt
-bin\components\nsDefaultCLH.js
-bin\components\nsFormAutoComplete.js
-
-; rdf
-bin\components\rdf.xpt
-
-; required i18n libraries
-bin\components\intl.xpt
-bin\components\locale.xpt
-bin\components\uconv.xpt
-bin\components\unicharutil.xpt
-
-; dom
-bin\components\dom.xpt
-bin\components\dom_base.xpt
-bin\components\dom_canvas.xpt
-bin\components\dom_core.xpt
-bin\components\dom_css.xpt
-bin\components\dom_events.xpt
-bin\components\dom_geolocation.xpt
-bin\components\dom_html.xpt
-bin\components\dom_json.xpt
-bin\components\dom_offline.xpt
-bin\components\dom_range.xpt
-bin\components\dom_sidebar.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
-bin\components\dom_smil.xpt
-#endif
-bin\components\dom_storage.xpt
-bin\components\dom_stylesheets.xpt
-bin\components\dom_threads.xpt
-bin\components\dom_traversal.xpt
-bin\components\dom_views.xpt
-bin\components\dom_xbl.xpt
-bin\components\dom_xul.xpt
-bin\components\dom_loadsave.xpt
-bin\components\NetworkGeolocationProvider.js
-bin\components\GPSDGeolocationProvider.js
-
-; editor / composer for HTML compose
-bin\components\editor.xpt
-bin\components\composer.xpt
-bin\components\txmgr.xpt
-
-; find functionality
-; Optional - only if your code uses nsIWebBrowserFind
-bin\components\txtsvc.xpt
-
-; moz storage
-bin\components\storage.xpt
-
-; netwerk
-bin\components\necko.xpt
-bin\components\necko_about.xpt
-bin\components\necko_dns.xpt
-bin\components\necko_http.xpt
-bin\components\necko_res.xpt
-bin\components\necko_strconv.xpt
-bin\components\necko_file.xpt
-bin\components\necko_ftp.xpt
-bin\components\necko_cache.xpt
-bin\components\necko_cookie.xpt
-bin\components\necko_socket.xpt
-bin\components\necko_viewsource.xpt
-bin\components\necko_wifi.xpt
-bin\components\nsProxyAutoConfig.js
-
-; extensions
-bin\components\nsAddonRepository.js
-bin\components\nsExtensionManager.js
-bin\components\nsBlocklistService.js
-#ifdef MOZ_UPDATER
-bin\components\nsUpdateService.js
-bin\components\nsUpdateServiceStub.js
-#endif
-bin\components\nsUpdateTimerManager.js
-bin\components\extensions.xpt
-bin\components\update.xpt
-#ifdef MOZ_WEBSERVICES
-bin\components\websrvcs.xpt
-#endif
-bin\components\nsURLFormatter.js
-bin\components\urlformatter.xpt
-bin\components\nsContentPrefService.js
-
-; plugins
-bin\components\plugin.xpt
-
-; psm2
-; Optional - only if you need HTTPS support
-bin\components\pipboot.xpt
-bin\components\pipnss.xpt
-bin\components\pippki.xpt
-bin\nss3.dll
-bin\nssutil3.dll
-bin\smime3.dll
-bin\softokn3.chk
-bin\softokn3.dll
-bin\freebl3.chk
-bin\freebl3.dll
-bin\ssl3.dll
-bin\nssckbi.dll
-bin\nssdbm3.chk
-bin\nssdbm3.dll
-
-; core platform files
-bin\components\FeedProcessor.js
-bin\components\xpautocomplete.xpt
-bin\components\autocomplete.xpt
-bin\components\alerts.xpt
-bin\components\jsdservice.xpt
-bin\components\fastfind.xpt
-bin\components\find.xpt
-bin\components\chardet.xpt
-bin\components\jsconsole-clhandler.js
-bin\components\layout_xul_tree.xpt
-bin\components\mozfind.xpt
-bin\components\mimetype.xpt
-bin\components\parentalcontrols.xpt
-bin\components\proxyObject.xpt
-bin\components\exthandler.xpt
-bin\components\exthelper.xpt
-bin\components\embed_base.xpt
-bin\components\webshell_idls.xpt
-bin\components\windowds.xpt
-bin\components\dom_xpath.xpt
-bin\AccessibleMarshal.dll
-bin\components\lwbrk.xpt
-bin\components\nsTryToClose.js
-bin\components\pluginGlue.js
-bin\components\txEXSLTRegExFunctions.js
-bin\components\feeds.xpt
-bin\components\saxparser.xpt
-bin\components\satchel.xpt
-bin\components\shistory.xpt
-bin\components\zipwriter.xpt
-bin\components\nsBadCertHandler.js
-bin\components\cookie.xpt
-bin\components\places.xpt
-bin\components\prefetch.xpt
-
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\res\arrow.gif
-bin\res\arrowd.gif
-bin\res\broken-image.png
-bin\res\charsetData.properties
-bin\res\charsetalias.properties
-bin\res\forms.css
-bin\res\hiddenWindow.html
-bin\res\html.css
-bin\res\loading-image.png
-bin\res\mathml.css
-bin\res\quirk.css
-bin\res\ua.css
-bin\res\viewsource.css
-bin\res\wincharset.properties
-#endif
-bin\res\langGroups.properties
-bin\res\language.properties
-bin\res\entityTables\*
-bin\res\dtd\*
-bin\res\fonts\*
-bin\res\contenteditable.css
-bin\res\designmode.css
-bin\res\html\folder.png
-
-; editor resource files
-bin\res\EditorOverride.css
-bin\res\grabber.gif
-bin\res\table-add-column-after-active.gif
-bin\res\table-add-column-after-hover.gif
-bin\res\table-add-column-after.gif
-bin\res\table-add-column-before-active.gif
-bin\res\table-add-column-before-hover.gif
-bin\res\table-add-column-before.gif
-bin\res\table-add-row-after-active.gif
-bin\res\table-add-row-after-hover.gif
-bin\res\table-add-row-after.gif
-bin\res\table-add-row-before-active.gif
-bin\res\table-add-row-before-hover.gif
-bin\res\table-add-row-before.gif
-bin\res\table-remove-column-active.gif
-bin\res\table-remove-column-hover.gif
-bin\res\table-remove-column.gif
-bin\res\table-remove-row-active.gif
-bin\res\table-remove-row-hover.gif
-bin\res\table-remove-row.gif
-
-; svg
-bin\res\svg.css
-bin\components\dom_svg.xpt
-
-; [Updater]
-bin\updater.exe
-
-; [crash reporter]
-bin\crashreporter.exe
-bin\crashreporter.ini
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; For packaging shared test builds
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-#ifndef MOZ_STATIC_BUILD
-bin\components\accessibility.dll
-bin\components\appshell.dll
-bin\components\auth.dll
-bin\components\autoconfig.dll
-bin\components\caps.dll
-bin\components\chardet.dll
-bin\components\chrome.dll
-bin\components\cmdlines.dll
-bin\components\composer.dll
-bin\components\cookie.dll
-bin\components\docshell.dll
-bin\components\embedcomponents.dll
-bin\components\gkgfxthebes.dll
-bin\components\gklayout.dll
-bin\components\gkparser.dll
-bin\components\gkplugin.dll
-bin\components\gkwidget.dll
-bin\components\i18n.dll
-bin\components\imgicon.dll
-bin\components\imglib2.dll
-bin\components\import.dll
-bin\components\intlapp.dll
-bin\components\mail.dll
-bin\components\mailcmp.dll
-bin\components\mork.dll
-bin\components\mozfind.dll
-bin\components\mozldap.dll
-bin\components\msgMapi.dll
-bin\components\msgsmime.dll
-bin\components\necko.dll
-bin\components\perms.dll
-bin\components\pipboot.dll
-bin\components\pipnss.dll
-bin\components\pippki.dll
-bin\components\rdf.dll
-bin\components\spellchk.dll
-bin\components\strgcmps.dll
-bin\components\tkautoc.dll
-bin\components\tkitcmps.dll
-bin\components\txmgr.dll
-bin\components\uconv.dll
-bin\components\ucvmath.dll
-bin\components\universalchardet.dll
-bin\components\webbrwsr.dll
-bin\components\windowds.dll
-bin\components\xpautoc.dll
-bin\components\xpc3250.dll
-bin\components\xppref32.dll
-bin\components\zipwriter.dll
-bin\gkgfx.dll
-bin\mozz.dll
-bin\thebes.dll
-bin\xul.dll
-#endif