mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
add packaging code to deal with the prefs extension if thunderbird is built with extensions=pref
This commit is contained in:
parent
1731be9206
commit
6e7ec721d5
@ -27,7 +27,10 @@ include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
BASEMAIL = basemail-win
|
||||
BASEMAIL_SUPP = basemail-win-supp
|
||||
|
||||
# packaging file for the pref extension which is optional
|
||||
PREF = pref-win
|
||||
|
||||
APP_NAME=thunderbird
|
||||
_PLATFORM = dos
|
||||
|
||||
@ -79,7 +82,10 @@ endif
|
||||
-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome
|
||||
|
||||
mail_copy::
|
||||
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEMAIL) -o $(_PLATFORM) -v
|
||||
$(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
|
||||
$(NSINSTALL) -t $(DIST)/bin/$(APP_NAME)$(BIN_SUFFIX) $(DIST)/$(APP_NAME)/
|
||||
$(NSINSTALL) -t $(MOZILLA_DIR)/mail/config/installed-chrome.txt $(DIST)/$(APP_NAME)/chrome
|
||||
|
||||
|
@ -109,3 +109,10 @@ locale/US/global-region, US/locale/US/global-re
|
||||
#################################################################################################
|
||||
locale/en-US/pippki, en-US/locale/en-US/pippki
|
||||
locale/en-US/pipnss, en-US/locale/en-US/pipnss
|
||||
|
||||
#################################################################################################
|
||||
# files for the optional pref extension
|
||||
#################################################################################################
|
||||
locale/en-US/autoconfig/contents.rdf, en-US/locale/en-US/autoconfig/contents.rdf
|
||||
locale/en-US/autoconfig/autoconfig.properties, en-US/locale/en-US/autoconfig/autoconfig.properties
|
||||
|
||||
|
@ -36,6 +36,8 @@ content,install,url,jar:resource:/chrome/mail.jar!/content/pipnss/
|
||||
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pipnss/
|
||||
content,install,url,jar:resource:/chrome/mail.jar!/content/pippki/
|
||||
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pippki/
|
||||
content,install,url,jar:resource:/chrome/mail.jar!/content/autoconfig/
|
||||
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/autoconfig/
|
||||
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mdn/
|
||||
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mdn/
|
||||
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-views/
|
||||
|
@ -75,7 +75,7 @@ content/communicator/pref/pref-languages.js, comm/content/communicator/
|
||||
content/communicator/pref/pref-proxies.js, comm/content/communicator/pref/pref-proxies.js
|
||||
content/communicator/pref/pref-policies.xul, comm/content/communicator/pref/pref-policies.xul
|
||||
content/communicator/pref/pref-proxies.xul, comm/content/communicator/pref/pref-proxies.xul
|
||||
content/communicator/pref/pref.xul, comm/content/communicator/pref//pref.xul
|
||||
content/communicator/pref/pref.xul, comm/content/communicator/pref/pref.xul
|
||||
content/communicator/pref/nsPrefWindow.js, comm/content/communicator/pref/nsPrefWindow.js
|
||||
content/communicator/pref/pref-applications-edit.xul, comm/content/communicator/pref/pref-applications-edit.xul
|
||||
content/communicator/pref/pref-calibrate-screen.xul, comm/content/communicator/pref/pref-calibrate-screen.xul
|
||||
@ -181,4 +181,9 @@ content/global/widgets, toolkit/content/global/wid
|
||||
content/pipnss/contents.rdf, pipnss/content/pipnss/contents.rdf
|
||||
content/pippki, pippki/content/pippki
|
||||
|
||||
|
||||
|
||||
#################################################################################################
|
||||
# files needed by the optional pref extension. These files may not necessarily exist if the extension
|
||||
# was not built. That's ok.
|
||||
#################################################################################################
|
||||
content/autoconfig/contents.rdf, comm/content/autoconfig/contents.rdf
|
19
mail/config/pref-win
Executable file
19
mail/config/pref-win
Executable file
@ -0,0 +1,19 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
; 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\*
|
Loading…
Reference in New Issue
Block a user