part of Bug #245430 --> thunderbird static build support.

Get rid of the mail\config packaging of chrome into dist\thunderbird. Let the installer do it as part of the
packaging process.
This commit is contained in:
scott%scott-macgregor.org 2004-07-18 21:47:27 +00:00
parent 554e1a41b3
commit af801ce18e
21 changed files with 327 additions and 853 deletions

View File

@ -32,14 +32,9 @@ DIRS = base components extensions app
# entering mail\config
ifeq ($(OS_ARCH),WINNT)
DIRS += config
ifdef MOZ_INSTALLER
DIRS += installer/windows
endif
endif
ifeq ($(OS_ARCH),Linux)
DIRS += config
endif
include $(topsrcdir)/config/rules.mk

View File

@ -26,80 +26,51 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
BASEMAIL = basemail-win
PREF = pref-win
INSPECTOR = inspector-win
_PLATFORM = dos
else
ifeq ($(OS_ARCH),OS2)
BASEMAIL = basemail-os2
PREF = pref-os2
INSPECTOR = inspector-os2
_PLATFORM = unix
else
BASEMAIL = basemail-unix
PREF = pref-unix
INSPECTOR = inspector-unix
_PLATFORM = unix
endif
endif
APP_NAME=thunderbird
mail_chrome: mail-jar.mn
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/comm
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/comm $(DIST)/bin/chrome/comm.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/comm
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/comm $(DIST)/bin/chrome/comm.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/toolkit
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/toolkit $(DIST)/bin/chrome/toolkit.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/toolkit
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/toolkit $(DIST)/bin/chrome/toolkit.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/msg
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/msg $(DIST)/bin/chrome/messenger.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/msg
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/msg $(DIST)/bin/chrome/messenger.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/classic
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/classic $(DIST)/bin/chrome/classic.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/classic
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/classic $(DIST)/bin/chrome/classic.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/en-US
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/en-US $(DIST)/bin/chrome/en-US.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/en-US
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/en-US $(DIST)/bin/chrome/en-US.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/US
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/US $(DIST)/bin/chrome/US.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/US
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/US $(DIST)/bin/chrome/US.jar
ifdef MOZ_PSM
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/pipnss
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/pipnss $(DIST)/bin/chrome/pipnss.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/pipnss
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/pipnss $(DIST)/bin/chrome/pipnss.jar
$(NSINSTALL) -D $(DIST)/$(APP_NAME)/tmpchrome/pippki
$(UNZIP) -o -d $(DIST)/$(APP_NAME)/tmpchrome/pippki $(DIST)/bin/chrome/pippki.jar
$(NSINSTALL) -D $(DIST)/bin/tmpchrome/pippki
$(UNZIP) -o -d $(DIST)/bin/tmpchrome/pippki $(DIST)/bin/chrome/pippki.jar
endif
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/mail-jar.mn -mozpath $(MOZILLA_DIR) -jarfile mail.jar -chrome $(DIST)/$(APP_NAME)/tmpchrome > $(MOZILLA_DIR)/mail/config/mail-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/$(APP_NAME)/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/mail-tmp.mn
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/mail-jar.mn -mozpath $(MOZILLA_DIR) -jarfile mail.jar -chrome $(DIST)/bin/tmpchrome > $(MOZILLA_DIR)/mail/config/mail-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/mail-tmp.mn
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/qute-jar.mn -mozpath $(MOZILLA_DIR) -jarfile qute.jar -chrome $(DIST)/$(APP_NAME)/tmpchrome > $(MOZILLA_DIR)/mail/config/qute-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/$(APP_NAME)/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/qute-tmp.mn
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/qute-jar.mn -mozpath $(MOZILLA_DIR) -jarfile qute.jar -chrome $(DIST)/bin/tmpchrome > $(MOZILLA_DIR)/mail/config/qute-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/qute-tmp.mn
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/en-US-jar.mn -mozpath $(MOZILLA_DIR) -jarfile en-US-mail.jar -chrome $(DIST)/$(APP_NAME)/tmpchrome > $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/$(APP_NAME)/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/mail/config/en-US-jar.mn -mozpath $(MOZILLA_DIR) -jarfile en-US-mail.jar -chrome $(DIST)/bin/tmpchrome > $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
-$(RM) -f $(MOZILLA_DIR)/mail/config/mail-tmp.mn
-$(RM) -f $(MOZILLA_DIR)/mail/config/qute-tmp.mn
-$(RM) -f $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome
-$(RM) -rf $(DIST)/bin/tmpchrome
mail_copy::
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEMAIL) -o $(_PLATFORM) -v
ifneq (,$(findstring pref,$(MOZ_EXTENSIONS)))
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(PREF) -o $(_PLATFORM) -v
endif
ifneq (,$(findstring inspector,$(MOZ_EXTENSIONS)))
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(INSPECTOR) -o $(_PLATFORM) -v
endif
$(NSINSTALL) -t $(DIST)/bin/$(APP_NAME)$(BIN_SUFFIX) $(DIST)/$(APP_NAME)/
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(MOZILLA_DIR)/mail/config/installed-chrome.txt > $(DIST)/$(APP_NAME)/chrome/installed-chrome.txt
rm -f $(DIST)/$(APP_NAME)/components/compreg.dat
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(MOZILLA_DIR)/mail/config/installed-chrome.txt > $(DIST)/bin/chrome/installed-chrome.txt
rm -f $(DIST)/bin/components/compreg.dat
libs::
$(MAKE) mail_chrome

View File

@ -1,364 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Base Thunderbird Package File for Win32
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Mail Specific Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components\mail.dll
components\import.dll
components\addrbook.xpt
components\mime.xpt
components\mailnews.xpt
components\msgbase.xpt
components\msgcompo.xpt
components\msgdb.xpt
components\msgimap.xpt
components\msglocal.xpt
components\msgnews.xpt
components\msgsearch.xpt
components\import.xpt
components\impComm4xMail.xpt
components\mailview.xpt
chrome\mail.jar
chrome\icons\default\abcardWindow.ico
chrome\icons\default\addressbookWindow.ico
chrome\icons\default\messengerWindow.ico
chrome\icons\default\msgcomposeWindow.ico
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Mail Extensions (smime, etc.)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
MapiProxy.dll
mozMapi32.dll
components\msgMapi.dll
components\mapihook.xpt
components\nsSetDefaultMail.js
components\nsUnsetDefaultMail.js
components\offlineStartup.js
components\mdn-service.js
components\smime-service.js
components\msgsmime.xpt
components\msgsmime.dll
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Chrome Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
chrome\qute.jar
chrome\en-US-mail.jar
chrome\en-win.jar
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; default pref files
defaults\pref\*
greprefs\*
defaults\messenger\mailViews.dat
defaults\profile\localstore.rdf
defaults\profile\mimeTypes.rdf
defaults\profile\US\localstore.rdf
defaults\profile\US\mimeTypes.rdf
defaults\profile\extensions\*
defaults\profile\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; App extensions to Mail
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; LDAP components
components\mozldap.dll
components\mozldap.xpt
components\nsLDAPPrefsService.js
nsldap32v50.dll
nsldappr32v50.dll
; wallet
components\wallet.dll
components\wallet.xpt
components\signonviewer.xpt
; download progress
components\nsProgressDialog.js
components\nsHelperAppDlg.js
components\nsDownloadProgressListener.js
components\downloadmanager.xpt
; spellchecker (may not be present)
components\myspell.dll
components\spellchecker.xpt
components\spellchk.dll
;; XXX these two files are bogus, they should not be in components\myspell...
components\myspell\*
; xpinstall (needed to dynamically install themes
components\xpinstal.dll
components\xpinstall.xpt
; xmlextras (for RSS feeds and the like)
components\xmlextras.dll
components\xmlextras.xpt
; offline extension (may not be present in the build, that's ok)
chrome\offline.jar
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Base Package Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
LICENSE.txt
README.txt
; NSPR:
nspr4.dll
plc4.dll
plds4.dll
; Javascript:
js3250.dll
components\jsd3250.dll
components\jsurl.xpt
; XPCOM:
xpcom.dll
xpcom_compat.dll
xpistub.dll
xpicleanup.exe
components\xpcom_compat_c.dll
components\xpcom_base.xpt
components\xpcom_components.xpt
components\xpcom_ds.xpt
components\xpcom_io.xpt
components\xpcom_thread.xpt
components\xpcom_xpti.xpt
components\xpcom_obsolete.xpt
; xpconnect
components\xpc3250.dll
components\xpconnect.xpt
; XP widgets/graphics
gkgfx.dll
components\gkgfxwin.dll
components\gkwidget.dll
components\widget.xpt
components\gfx.xpt
; layout
components\gklayout.dll
components\gkparser.dll
components\layout_base.xpt
components\layout_xul.xpt
components\content_base.xpt
components\htmlparser.xpt
components\content_html.xpt
components\content_htmldoc.xpt
components\content_xmldoc.xpt
components\content_xslt.xpt
components\xultmpl.xpt
components\xuldoc.xpt
; Imaging:
mozz.dll
components\imglib2.dll
components\imgicon.dll
components\imgicon.xpt
components\imglib2.xpt
; accessibility (out of process API support)
components\accessibility.dll
components\accessibility.xpt
components\accessibility-msaa.xpt
; caps (JavaScript security)
components\caps.dll
components\caps.xpt
; glue: appshell, docshell, uriloader, chrome, components
components\appshell.dll
components\appshell.xpt
components\docshell.dll
components\docshell_base.xpt
components\uriloader.xpt
components\chrome.dll
components\webbrwsr.dll
components\webBrowser_core.xpt
components\embedcomponents.dll
components\windowwatcher.xpt
components\webbrowserpersist.xpt
components\commandhandler.xpt
; we need mozbrwser.xpt for nsIXULWindow.xpt
components\mozbrwsr.xpt
; jar
components\jar50.dll
components\jar.xpt
; prefs
components\pref.xpt
components\xppref32.dll
; profile
components\profile.xpt
components\profilemigration.dll
components\toolkitprofile.xpt
; rdf
components\rdf.dll
components\rdf.xpt
; required i18n libraries
components\i18n.dll
components\intl.xpt
components\locale.xpt
components\uconv.dll
components\uconv.xpt
components\unicharutil.xpt
; dom
components\dom.xpt
components\dom_base.xpt
components\dom_core.xpt
components\dom_css.xpt
components\dom_events.xpt
components\dom_html.xpt
components\dom_range.xpt
components\dom_stylesheets.xpt
components\dom_traversal.xpt
components\dom_views.xpt
components\dom_xbl.xpt
components\dom_xul.xpt
components\dom_loadsave.xpt
; editor / composer for HTML compose
components\editor.dll
components\editor.xpt
components\composer.xpt
components\composer.dll
components\txmgr.dll
components\txmgr.xpt
; find functionality
; Optional - only if your code uses nsIWebBrowserFind
components\txtsvc.xpt
; netwerk
components\necko.dll
components\necko2.dll
components\necko.xpt
components\necko_data.xpt
components\necko_dns.xpt
components\necko_http.xpt
components\necko_jar.xpt
components\necko_res.xpt
components\necko_strconv.xpt
components\necko_file.xpt
components\necko_cache.xpt
components\necko_cookie.xpt
components\nsProxyAutoConfig.js
; psm2
; Optional - only if you need HTTPS support
components\pipboot.dll
components\pipboot.xpt
components\pipnss.dll
components\pipnss.xpt
components\pippki.dll
components\pippki.xpt
nss3.dll
smime3.dll
softokn3.chk
softokn3.dll
ssl3.dll
nssckbi.dll
; core platform files
regxpcom.exe
components\appcomps.dll
components\autocomplete.xpt
components\alerts.xpt
components\jsdservice.xpt
components\find.xpt
components\chardet.xpt
components\jsconsole-clhandler.js
components\layout_xul_tree.xpt
components\mork.dll
components\mozfind.dll
components\mozfind.xpt
components\mimetype.xpt
components\nsprefm.dll
components\prefmigr.xpt
components\proxyObject.xpt
components\exthandler.xpt
components\embed_base.xpt
components\webshell_idls.xpt
components\widget.xpt
components\windowds.xpt
components\wlltvwrs.dll
components\helperAppDlg.xpt
components\progressDlg.xpt
components\dom_xpath.xpt
AccessibleMarshal.dll
components\lwbrk.xpt
components\nsCloseAllWindows.js
components\winhooks.xpt
res\ua.css
res\html.css
res\quirk.css
res\forms.css
res\platform-forms.css
res\charsetData.properties
res\charsetalias.properties
res\langGroups.properties
res\language.properties
res\wincharset.properties
res\builtin\*
res\entityTables\*
; editor resource files
res\EditorOverride.css
res\grabber.gif
res\table-add-column-after-active.gif
res\table-add-column-after-hover.gif
res\table-add-column-after.gif
res\table-add-column-before-active.gif
res\table-add-column-before-hover.gif
res\table-add-column-before.gif
res\table-add-row-after-active.gif
res\table-add-row-after-hover.gif
res\table-add-row-after.gif
res\table-add-row-before-active.gif
res\table-add-row-before-hover.gif
res\table-add-row-before.gif
res\table-remove-column-active.gif
res\table-remove-column-hover.gif
res\table-remove-column.gif
res\table-remove-row-active.gif
res\table-remove-row-hover.gif
res\table-remove-row.gif
; extensions
components\nsExtensionManager.js
components\nsBackgroundUpdateService.js
components\extensions.xpt
components\update.xpt
; talkback
components\qfaservices.dll
components\qfaservices.xpt
components\BrandRes.dll
components\fullsoft.dll
components\master.ini
components\talkback-l10n.ini
components\talkback.cnt
components\talkback.exe
components\talkback.hlp

View File

@ -1,23 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Inspector Package File for OS/2. Only used when
; Thunderbird is built with the inspector extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
components\inspector-cmdline.js
chrome\inspector.jar
res\inspector\viewer-registry.rdf
res\inspector\search-registry.rdf
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components\inspectr.dll
components\inspector.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults\pref\inspector.js

View File

@ -1,23 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Inspector Package File for Win32. Only used when
; Thunderbird is built with the inspector extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
components/inspector-cmdline.js
chrome/inspector.jar
res/inspector/viewer-registry.rdf
res/inspector/search-registry.rdf
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components/libinspector.so
components/inspector.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults/pref/inspector.js

View File

@ -1,23 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Inspector Package File for Win32. Only used when
; Thunderbird is built with the inspector extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
components\inspector-cmdline.js
chrome\inspector.jar
res\inspector\viewer-registry.rdf
res\inspector\search-registry.rdf
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components\inspector.dll
components\inspector.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults\pref\inspector.js

View File

@ -1,22 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Pref Package File for OS/2. Only used when
; Thunderbird is built with the pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components\autoconfig.dll
components\autoconfig.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults\autoconfig\*

View File

@ -1,22 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Pref Package File for Win32. Only used when
; Thunderbird is built with the pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components/libautoconfig.so
components/autoconfig.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults/autoconfig/*

View File

@ -1,22 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Pref Package File for Win32. Only used when
; Thunderbird is built with the pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[thunderbird]
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; DLLs for pref extension
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
components\autoconfig.dll
components\autoconfig.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
defaults\autoconfig\*

View File

@ -42,6 +42,63 @@ VPATH = @srcdir@
NO_GECKO_SDK=1
NO_PKG_FILES = \
TestGtkEmbed \
bloaturls.txt \
codesighs* \
elf-dynstr-gc \
thunderbird-config \
mangle* \
maptsv* \
mfc* \
mkdepend* \
msdump* \
msmap* \
nm2tsv* \
nsinstall* \
rebasedlls* \
regchrome* \
regxpcom* \
res/samples \
res/throbber \
shlibsign* \
winEmbed.exe \
xpcshell* \
xpidl* \
xpt_dump* \
xpt_link* \
dirver* \
plugins \
res/arrow.gif \
res/arrowd.gif \
res/boatcycle.html \
res/cmessage.txt \
res/dtd \
res/html \
res/loading-image.gif \
res/rdf \
res/viewer.properties \
res/viewsource.css \
chrome/US.jar \
chrome/chromelist.txt \
chrome/classic.jar \
chrome/comm.jar \
chrome/embed-sample.jar \
chrome/en-US.jar \
chrome/messenger.jar \
chrome/pipnss.jar \
chrome/pippki.jar \
chrome/toolkit.jar \
PalmSyncInstall.exe \
$(NULL)
ifeq ($(OS_ARCH), WINNT)
NO_PKG_FILES += \
chrome/en-unix.jar \
chrome/en-mac.jar \
$(NULL)
endif
# Before building the installer, re-make in mail/config to pick up
# new files in dist/bin. This is needed for Talkback.
libs::
@ -52,6 +109,12 @@ libs::
installer::
$(MAKE) -C ../config
ifeq ($(OS_ARCH), Darwin)
MOZ_PKG_APPNAME = Thunderbird
endif
include $(DEPTH)/config/autoconf.mk
include $(DEPTH)/xpinstall/packager/Makefile
# Rename the archive after it's created, so that we can differentiate between

View File

@ -20,11 +20,11 @@ logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "$Version$", "thunderbird", fProgram, "", true);
err = addDirectory("", "$Version$", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("Inspector Command Line Handler",
"thunderbird/components/inspector-cmdline.js",
"bin/components/inspector-cmdline.js",
getFolder("Components"),
"");

View File

@ -3,381 +3,327 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[langenus]
thunderbird\chrome\en-US-mail.jar
thunderbird\chrome\en-win.jar
bin\chrome\en-US-mail.jar
bin\chrome\en-win.jar
[regus]
thunderbird\defaults\profile\US\localstore.rdf
thunderbird\defaults\profile\US\mimeTypes.rdf
bin\defaults\profile\US\localstore.rdf
bin\defaults\profile\US\mimeTypes.rdf
[deflenus]
thunderbird\defaults\messenger\mailViews.dat
thunderbird\defaults\profile\localstore.rdf
thunderbird\defaults\profile\mimeTypes.rdf
thunderbird\defaults\profile\extensions\*
thunderbird\defaults\profile\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
bin\defaults\messenger\mailViews.dat
bin\defaults\profile\localstore.rdf
bin\defaults\profile\mimeTypes.rdf
bin\defaults\profile\extensions\*
bin\defaults\profile\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
[xpcom]
thunderbird\xpcom.dll
thunderbird\xpcom_compat.dll
thunderbird\components\xpcom_compat_c.dll
thunderbird\xpistub.dll
thunderbird\components\jar50.dll
thunderbird\components\xpcom_base.xpt
thunderbird\components\xpcom_components.xpt
thunderbird\components\xpcom_ds.xpt
thunderbird\components\xpcom_io.xpt
thunderbird\components\xpcom_thread.xpt
thunderbird\components\xpcom_xpti.xpt
thunderbird\components\xpcom_obsolete.xpt
thunderbird\nspr4.dll
thunderbird\plc4.dll
thunderbird\plds4.dll
thunderbird\js3250.dll
thunderbird\components\jsd3250.dll
thunderbird\components\xpinstal.dll
thunderbird\mozz.dll
bin\xpcom.dll
bin\xpcom_compat.dll
bin\xpistub.dll
bin\components\jar50.dll
bin\components\xpcom_base.xpt
bin\components\xpcom_components.xpt
bin\components\xpcom_ds.xpt
bin\components\xpcom_io.xpt
bin\components\xpcom_thread.xpt
bin\components\xpcom_xpti.xpt
bin\components\xpcom_obsolete.xpt
bin\nspr4.dll
bin\plc4.dll
bin\plds4.dll
bin\js3250.dll
bin\components\jsd3250.dll
bin\components\xpinstal.dll
; Optional offline extension
[offline]
thunderbird\chrome\offline.jar
; [Additional Developer Tools]
[adt]
; [Document Inspector]
thunderbird\components\inspector-cmdline.js
thunderbird\components\inspector.dll
thunderbird\components\inspector.xpt
thunderbird\chrome\inspector.jar
thunderbird\defaults\pref\inspector.js
thunderbird\res\inspector\viewer-registry.rdf
thunderbird\res\inspector\search-registry.rdf
bin\chrome\offline.jar
; Optional Talkback
[talkback]
thunderbird\components\qfaservices.dll
thunderbird\components\qfaservices.xpt
thunderbird\components\BrandRes.dll
thunderbird\components\fullsoft.dll
thunderbird\components\master.ini
thunderbird\components\talkback-l10n.ini
thunderbird\components\talkback.cnt
thunderbird\components\talkback.exe
thunderbird\components\talkback.hlp
bin\components\qfaservices.dll
bin\components\qfaservices.xpt
bin\components\BrandRes.dll
bin\components\fullsoft.dll
bin\components\master.ini
bin\components\talkback-l10n.ini
bin\components\talkback.cnt
bin\components\talkback.exe
bin\components\talkback.hlp
[mail]
thunderbird\xpicleanup.exe
thunderbird\thunderbird.exe
thunderbird\LICENSE.txt
thunderbird\README.txt
bin\xpicleanup.exe
bin\thunderbird.exe
bin\LICENSE.txt
bin\README.txt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Mail Specific Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
thunderbird\components\mail.dll
thunderbird\components\import.dll
bin\components\addrbook.xpt
bin\components\mime.xpt
bin\components\mailnews.xpt
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
thunderbird\components\addrbook.xpt
thunderbird\components\mime.xpt
thunderbird\components\mailnews.xpt
thunderbird\components\msgbase.xpt
thunderbird\components\msgcompo.xpt
thunderbird\components\msgdb.xpt
thunderbird\components\msgimap.xpt
thunderbird\components\msglocal.xpt
thunderbird\components\msgnews.xpt
thunderbird\components\msgsearch.xpt
thunderbird\components\import.xpt
thunderbird\components\impComm4xMail.xpt
thunderbird\components\mailview.xpt
thunderbird\chrome\mail.jar
thunderbird\chrome\icons\default\abcardWindow.ico
thunderbird\chrome\icons\default\addressbookWindow.ico
thunderbird\chrome\icons\default\messengerWindow.ico
thunderbird\chrome\icons\default\msgcomposeWindow.ico
bin\chrome\mail.jar
bin\chrome\icons\default\abcardWindow.ico
bin\chrome\icons\default\addressbookWindow.ico
bin\chrome\icons\default\messengerWindow.ico
bin\chrome\icons\default\msgcomposeWindow.ico
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Mail Extensions (smime, etc.)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
thunderbird\MapiProxy.dll
thunderbird\mozMapi32.dll
thunderbird\components\msgMapi.dll
thunderbird\components\mapihook.xpt
thunderbird\components\nsSetDefaultMail.js
thunderbird\components\nsUnsetDefaultMail.js
thunderbird\components\offlineStartup.js
bin\MapiProxy.dll
bin\mozMapi32.dll
bin\components\mapihook.xpt
bin\components\nsSetDefaultMail.js
bin\components\nsUnsetDefaultMail.js
bin\components\offlineStartup.js
thunderbird\components\mdn-service.js
bin\components\mdn-service.js
thunderbird\components\smime-service.js
thunderbird\components\msgsmime.xpt
thunderbird\components\msgsmime.dll
bin\components\smime-service.js
bin\components\msgsmime.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Chrome Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
thunderbird\chrome\qute.jar
bin\chrome\qute.jar
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; default pref files
thunderbird\defaults\pref\
thunderbird\greprefs\
bin\defaults\pref\
bin\greprefs\
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; App extensions to Mail
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; LDAP components
thunderbird\components\mozldap.dll
thunderbird\components\mozldap.xpt
thunderbird\components\nsLDAPPrefsService.js
thunderbird\nsldap32v50.dll
thunderbird\nsldappr32v50.dll
bin\components\mozldap.xpt
bin\components\nsLDAPPrefsService.js
bin\nsldap32v50.dll
bin\nsldappr32v50.dll
; wallet
thunderbird\components\wallet.dll
thunderbird\components\wallet.xpt
thunderbird\components\signonviewer.xpt
bin\components\wallet.xpt
bin\components\signonviewer.xpt
; download progress
thunderbird\components\nsProgressDialog.js
thunderbird\components\nsHelperAppDlg.js
thunderbird\components\nsDownloadProgressListener.js
thunderbird\components\downloadmanager.xpt
bin\components\nsProgressDialog.js
bin\components\nsHelperAppDlg.js
bin\components\nsDownloadProgressListener.js
bin\components\downloadmanager.xpt
; spellchecker (may not be present)
thunderbird\components\myspell.dll
thunderbird\components\spellchecker.xpt
thunderbird\components\spellchk.dll
bin\components\myspell.dll
bin\components\spellchecker.xpt
bin\components\spellchk.dll
;; XXX these two files are bogus, they should not be in components\myspell...
thunderbird\components\myspell\*
bin\components\myspell\*
; xpinstall (needed to dynamically install themes
thunderbird\components\xpinstall.xpt
bin\components\xpinstall.xpt
; xmlextras (for RSS feeds and the like)
thunderbird\components\xmlextras.dll
thunderbird\components\xmlextras.xpt
bin\components\xmlextras.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Base Package Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Javascript:
thunderbird\components\jsurl.xpt
bin\components\jsurl.xpt
; xpconnect
thunderbird\components\xpc3250.dll
thunderbird\components\xpconnect.xpt
bin\components\xpconnect.xpt
; XP widgets/graphics
thunderbird\gkgfx.dll
thunderbird\components\gkgfxwin.dll
thunderbird\components\gkwidget.dll
thunderbird\components\widget.xpt
thunderbird\components\gfx.xpt
bin\components\widget.xpt
bin\components\gfx.xpt
; layout
thunderbird\components\gklayout.dll
thunderbird\components\gkparser.dll
thunderbird\components\layout_base.xpt
thunderbird\components\layout_xul.xpt
thunderbird\components\content_base.xpt
thunderbird\components\htmlparser.xpt
thunderbird\components\content_html.xpt
thunderbird\components\content_htmldoc.xpt
thunderbird\components\content_xmldoc.xpt
thunderbird\components\content_xslt.xpt
thunderbird\components\xultmpl.xpt
thunderbird\components\xuldoc.xpt
bin\components\layout_base.xpt
bin\components\layout_xul.xpt
bin\components\content_base.xpt
bin\components\htmlparser.xpt
bin\components\content_html.xpt
bin\components\content_htmldoc.xpt
bin\components\content_xmldoc.xpt
bin\components\content_xslt.xpt
bin\components\xultmpl.xpt
bin\components\xuldoc.xpt
; Imaging:
thunderbird\components\imglib2.dll
thunderbird\components\imgicon.dll
thunderbird\components\imgicon.xpt
thunderbird\components\imglib2.xpt
bin\components\imgicon.xpt
bin\components\imglib2.xpt
; accessibility (out of process API support)
thunderbird\components\accessibility.dll
thunderbird\components\accessibility.xpt
thunderbird\components\accessibility-msaa.xpt
bin\components\accessibility.xpt
bin\components\accessibility-msaa.xpt
; caps (JavaScript security)
thunderbird\components\caps.dll
thunderbird\components\caps.xpt
bin\components\caps.xpt
; glue: appshell, docshell, uriloader, chrome, components
thunderbird\components\appshell.dll
thunderbird\components\appshell.xpt
thunderbird\components\docshell.dll
thunderbird\components\docshell_base.xpt
thunderbird\components\uriloader.xpt
thunderbird\components\chrome.dll
thunderbird\components\webbrwsr.dll
thunderbird\components\webBrowser_core.xpt
thunderbird\components\embedcomponents.dll
thunderbird\components\windowwatcher.xpt
thunderbird\components\webbrowserpersist.xpt
thunderbird\components\commandhandler.xpt
bin\components\appshell.xpt
bin\components\docshell_base.xpt
bin\components\uriloader.xpt
bin\components\webBrowser_core.xpt
bin\components\windowwatcher.xpt
bin\components\webbrowserpersist.xpt
bin\components\commandhandler.xpt
; we need mozbrwser.xpt for nsIXULWindow.xpt
thunderbird\components\mozbrwsr.xpt
bin\components\mozbrwsr.xpt
; jar
thunderbird\components\jar.xpt
bin\components\jar.xpt
; prefs
thunderbird\components\pref.xpt
thunderbird\components\xppref32.dll
bin\components\pref.xpt
; profile
thunderbird\components\profile.xpt
thunderbird\components\profilemigration.dll
thunderbird\components\toolkitprofile.xpt
bin\components\profile.xpt
bin\components\toolkitprofile.xpt
; rdf
thunderbird\components\rdf.dll
thunderbird\components\rdf.xpt
bin\components\rdf.xpt
; required i18n libraries
thunderbird\components\i18n.dll
thunderbird\components\intl.xpt
thunderbird\components\locale.xpt
thunderbird\components\uconv.dll
thunderbird\components\uconv.xpt
thunderbird\components\unicharutil.xpt
bin\components\intl.xpt
bin\components\locale.xpt
bin\components\uconv.xpt
bin\components\unicharutil.xpt
; dom
thunderbird\components\dom.xpt
thunderbird\components\dom_base.xpt
thunderbird\components\dom_core.xpt
thunderbird\components\dom_css.xpt
thunderbird\components\dom_events.xpt
thunderbird\components\dom_html.xpt
thunderbird\components\dom_range.xpt
thunderbird\components\dom_stylesheets.xpt
thunderbird\components\dom_traversal.xpt
thunderbird\components\dom_views.xpt
thunderbird\components\dom_xbl.xpt
thunderbird\components\dom_xul.xpt
thunderbird\components\dom_loadsave.xpt
bin\components\dom.xpt
bin\components\dom_base.xpt
bin\components\dom_core.xpt
bin\components\dom_css.xpt
bin\components\dom_events.xpt
bin\components\dom_html.xpt
bin\components\dom_range.xpt
bin\components\dom_stylesheets.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
; editor / composer for HTML compose
thunderbird\components\editor.dll
thunderbird\components\editor.xpt
thunderbird\components\composer.xpt
thunderbird\components\composer.dll
thunderbird\components\txmgr.dll
thunderbird\components\txmgr.xpt
bin\components\editor.xpt
bin\components\composer.xpt
bin\components\txmgr.xpt
; find functionality
; Optional - only if your code uses nsIWebBrowserFind
thunderbird\components\txtsvc.xpt
bin\components\txtsvc.xpt
; netwerk
thunderbird\components\necko.dll
thunderbird\components\necko2.dll
thunderbird\components\necko.xpt
thunderbird\components\necko_data.xpt
thunderbird\components\necko_dns.xpt
thunderbird\components\necko_http.xpt
thunderbird\components\necko_jar.xpt
thunderbird\components\necko_res.xpt
thunderbird\components\necko_strconv.xpt
thunderbird\components\necko_file.xpt
thunderbird\components\necko_cache.xpt
thunderbird\components\necko_cookie.xpt
thunderbird\components\nsProxyAutoConfig.js
bin\components\necko.xpt
bin\components\necko_data.xpt
bin\components\necko_dns.xpt
bin\components\necko_http.xpt
bin\components\necko_jar.xpt
bin\components\necko_res.xpt
bin\components\necko_strconv.xpt
bin\components\necko_file.xpt
bin\components\necko_cache.xpt
bin\components\necko_cookie.xpt
bin\components\nsProxyAutoConfig.js
; extensions
thunderbird\components\nsExtensionManager.js
thunderbird\components\nsBackgroundUpdateService.js
thunderbird\components\extensions.xpt
thunderbird\components\update.xpt
bin\components\nsExtensionManager.js
bin\components\nsBackgroundUpdateService.js
bin\components\extensions.xpt
bin\components\update.xpt
; psm2
; Optional - only if you need HTTPS support
thunderbird\components\pipboot.dll
thunderbird\components\pipboot.xpt
thunderbird\components\pipnss.dll
thunderbird\components\pipnss.xpt
thunderbird\components\pippki.dll
thunderbird\components\pippki.xpt
thunderbird\nss3.dll
thunderbird\smime3.dll
thunderbird\softokn3.chk
thunderbird\softokn3.dll
thunderbird\ssl3.dll
thunderbird\nssckbi.dll
bin\components\pipboot.xpt
bin\components\pipnss.xpt
bin\components\pippki.xpt
bin\nss3.dll
bin\smime3.dll
bin\softokn3.chk
bin\softokn3.dll
bin\ssl3.dll
bin\nssckbi.dll
; core platform files
thunderbird\regxpcom.exe
thunderbird\components\appcomps.dll
thunderbird\components\autocomplete.xpt
thunderbird\components\alerts.xpt
thunderbird\components\jsdservice.xpt
thunderbird\components\find.xpt
thunderbird\components\chardet.xpt
thunderbird\components\jsconsole-clhandler.js
thunderbird\components\layout_xul_tree.xpt
thunderbird\components\mork.dll
thunderbird\components\mozfind.dll
thunderbird\components\mozfind.xpt
thunderbird\components\mimetype.xpt
thunderbird\components\nsprefm.dll
thunderbird\components\prefmigr.xpt
thunderbird\components\proxyObject.xpt
thunderbird\components\exthandler.xpt
thunderbird\components\embed_base.xpt
thunderbird\components\webshell_idls.xpt
thunderbird\components\widget.xpt
thunderbird\components\windowds.xpt
thunderbird\components\wlltvwrs.dll
thunderbird\components\helperAppDlg.xpt
thunderbird\components\progressDlg.xpt
thunderbird\components\dom_xpath.xpt
thunderbird\AccessibleMarshal.dll
thunderbird\components\lwbrk.xpt
thunderbird\components\nsCloseAllWindows.js
thunderbird\components\winhooks.xpt
bin\regxpcom.exe
bin\components\autocomplete.xpt
bin\components\alerts.xpt
bin\components\jsdservice.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\prefmigr.xpt
bin\components\proxyObject.xpt
bin\components\exthandler.xpt
bin\components\embed_base.xpt
bin\components\webshell_idls.xpt
bin\components\widget.xpt
bin\components\windowds.xpt
bin\components\helperAppDlg.xpt
bin\components\progressDlg.xpt
bin\components\dom_xpath.xpt
bin\AccessibleMarshal.dll
bin\components\lwbrk.xpt
bin\components\nsCloseAllWindows.js
bin\components\winhooks.xpt
thunderbird\res\ua.css
thunderbird\res\html.css
thunderbird\res\quirk.css
thunderbird\res\forms.css
thunderbird\res\platform-forms.css
thunderbird\res\charsetData.properties
thunderbird\res\charsetalias.properties
thunderbird\res\langGroups.properties
thunderbird\res\language.properties
thunderbird\res\wincharset.properties
thunderbird\res\builtin\*
thunderbird\res\entityTables\*
bin\res\ua.css
bin\res\html.css
bin\res\quirk.css
bin\res\forms.css
bin\res\platform-forms.css
bin\res\charsetData.properties
bin\res\charsetalias.properties
bin\res\langGroups.properties
bin\res\language.properties
bin\res\wincharset.properties
bin\res\builtin\*
bin\res\entityTables\*
; editor resource files
thunderbird\res\EditorOverride.css
thunderbird\res\grabber.gif
thunderbird\res\table-add-column-after-active.gif
thunderbird\res\table-add-column-after-hover.gif
thunderbird\res\table-add-column-after.gif
thunderbird\res\table-add-column-before-active.gif
thunderbird\res\table-add-column-before-hover.gif
thunderbird\res\table-add-column-before.gif
thunderbird\res\table-add-row-after-active.gif
thunderbird\res\table-add-row-after-hover.gif
thunderbird\res\table-add-row-after.gif
thunderbird\res\table-add-row-before-active.gif
thunderbird\res\table-add-row-before-hover.gif
thunderbird\res\table-add-row-before.gif
thunderbird\res\table-remove-column-active.gif
thunderbird\res\table-remove-column-hover.gif
thunderbird\res\table-remove-column.gif
thunderbird\res\table-remove-row-active.gif
thunderbird\res\table-remove-row-hover.gif
thunderbird\res\table-remove-row.gif
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

View File

@ -8,7 +8,7 @@ var prettyName = "US English profile default";
var regName = "defaults/mozilla/en-US";
// --- END CHANGABLE STUFF ---
srDest = $SpaceRequired$:thunderbird;
srDest = $SpaceRequired$:bin;
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
@ -21,7 +21,7 @@ if(verifyDiskSpace(fProgram, srDest))
err = addDirectory("",
"$Version$",
"thunderbird", // dir name in jar to extract
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
true); // Force Flag

View File

@ -4,7 +4,7 @@ NameProduct = Mozilla Thunderbird
NameProductInternal = Mozilla Thunderbird
ShortNameProduct = Thunderbird
VersionProduct = 0.6.0+
DistSubdir = thunderbird
DistSubdir = bin
packagesFile = basemail-win
FileInstallerEXE = ThunderbirdSetup.exe
FileMainEXE = thunderbird.exe

View File

@ -19,7 +19,7 @@ var chromeName = chromeNode + "-mail.jar";
var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = $SpaceRequired$:thunderbird;
srDest = $SpaceRequired$:bin;
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
@ -30,7 +30,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
var chromeType = LOCALE;
err = addDirectory("",
"thunderbird", // dir name in jar to extract
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
""); // Force Flag
logComment("addDirectory() returned: " + err);
@ -43,7 +43,7 @@ if(verifyDiskSpace(fProgram, srDest))
chromeType |= PROFILE_CHROME;
fProgram = getFolder("Profile");
logComment("try installing to the user profile:" + fProgram);
err = addDirectory("","thunderbird",fProgram,"");
err = addDirectory("","bin",fProgram,"");
}
setPackageFolder(fProgram);

View File

@ -269,7 +269,7 @@ function updateMapi()
// appropriate previous Mapi32.dll.
addFile("",
"$Version$",
"thunderbird/mozMapi32.dll", // file name in jar to extract
"bin/mozMapi32.dll", // file name in jar to extract
getFolder("Win System"), // Where to put this file (Returned from getFolder)
"Mapi32.dll", // new name when installed
DO_NOT_UNINSTALL);
@ -494,7 +494,7 @@ logComment("args: " + args);
if(args == "-greLocal")
gGreLocal = true;
srDest = $SpaceRequired$:thunderbird;
srDest = $SpaceRequired$:bin;
err = initInstall("$ProductName$", "Mail", "$Version$");
logComment("initInstall: " + err);
@ -509,7 +509,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"$Version$",
"thunderbird", // dir name in jar to extract
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
true); // Force Flag

View File

@ -6,7 +6,7 @@ logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "$Version$", "thunderbird", fProgram, "", true);
err = addDirectory("", "$Version$", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
var jarFolder = getFolder("Chrome", "offline.jar");

View File

@ -16,7 +16,7 @@ var regName = "locales/mozilla/" + chromeNode;
var chromeName = lang + "-mail.jar";
var localeName = "locale/" + chromeNode + "/";
srDest = $SpaceRequired$:thunderbird;
srDest = $SpaceRequired$:bin;
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
@ -32,7 +32,7 @@ if(verifyDiskSpace(fProgram, srDest))
//fTarget = getFolder("Chrome");
//err = addDirectory("",
// "thunderbird/chrome", // dir name in jar to extract
// "bin/chrome", // dir name in jar to extract
// fTarget, // Where to put this file (Returned from GetFolder)
// ""); // subdir name to create relative to fProgram
//logComment("addDirectory() returned: " + err);
@ -40,7 +40,7 @@ if(verifyDiskSpace(fProgram, srDest))
fTarget = getFolder("Program", "defaults");
logComment("fTarget: " + fTarget);
err = addDirectory("",
"thunderbird/defaults", // dir name in jar to extract
"bin/defaults", // dir name in jar to extract
fTarget, // Where to put this file (Returned from GetFolder)
""); // subdir name to create relative to fProgram
logComment("addDirectory() returned: " + err);
@ -52,7 +52,7 @@ if(verifyDiskSpace(fProgram, srDest))
chromeType |= PROFILE_CHROME;
fProgram = getFolder("Profile");
logComment("try installing to the profile: " + fProgram);
err = addDirectory("","thunderbird/chrome",fProgram,"chrome");
err = addDirectory("","bin/chrome",fProgram,"chrome");
}
if (err == SUCCESS)

View File

@ -105,7 +105,7 @@ if (verifyDiskSpace(communicatorFolder, srDest))
{
err = addDirectory("",
"$Version$",
"thunderbird", // jar source folder
"bin", // jar source folder
communicatorFolder, // target folder
"", // target subdir
true ); // force flag

View File

@ -18,7 +18,7 @@ var fileComponentRegStr;
var fileMsvcrt;
var fileMsvcirt;
srDest = $SpaceRequired$:thunderbird;
srDest = $SpaceRequired$:bin;
err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$");
logComment("initInstall: " + err);
@ -41,7 +41,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"$Version$",
"thunderbird", // dir name in jar to extract
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
true); // Force Flag

View File

@ -210,7 +210,6 @@ endif
endif
$(PACKAGE): $(MOZILLA_BIN)
ifneq ($(MOZ_PKG_APPNAME),thunderbird)
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $@ $(EXCLUDE_LIST)
# NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree.
@ -228,7 +227,6 @@ ifndef EXCLUDE_NSPR_LIBS
endif
endif
endif # DMG
endif # not Thunderbird
@echo "Stripping package directory..."
@cd $(DIST)/$(MOZ_PKG_APPNAME); find . ! -type d \
! -name "*.js" \