зеркало из https://github.com/mozilla/gecko-dev.git
Bug #367562 --> add the ability to package ISP RDF files on a per locale basis by listing locale specific RDF files in a isps.txt file for each locale. These locale specific isp files get exported to bin\isp\AB_CD\
r=l10n sr=bsmedberg
This commit is contained in:
scott%scott-macgregor.org
Родитель
c183a43d5a
Коммит
fe35ac36a9
|
|
@ -190,6 +190,7 @@ defaults/isp/en-US/movemail.rdf
|
|||
defaults/isp/en-US/dotmac.rdf
|
||||
defaults/isp/en-US/
|
||||
defaults/isp/
|
||||
isp/gmail.rdf
|
||||
|
||||
@DLL_PREFIX@zlib@DLL_SUFFIX@
|
||||
#Remove Talkback files from old location (in case user updates from 1.0.x)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ bin\chrome\mail-locales.manifest
|
|||
bin\dictionaries\*
|
||||
bin\uninstall\helper.exe
|
||||
bin\updater.ini
|
||||
bin\isp\@AB_CD@\*
|
||||
|
||||
[xpcom]
|
||||
bin\xpcom.dll
|
||||
|
|
@ -45,7 +46,6 @@ bin\chrome\offline.manifest
|
|||
[newsblog]
|
||||
bin\chrome\newsblog.jar
|
||||
bin\chrome\newsblog.manifest
|
||||
bin\isp\rss.rdf
|
||||
bin\components\newsblog.js
|
||||
|
||||
; Optional Talkback
|
||||
|
|
@ -78,9 +78,7 @@ bin\defaults\profile\localstore.rdf
|
|||
bin\defaults\profile\prefs.js
|
||||
bin\defaults\profile\mimeTypes.rdf
|
||||
|
||||
bin\isp\gmail.rdf
|
||||
bin\isp\SpamAssassin.sfd
|
||||
bin\isp\SpamPal.sfd
|
||||
bin\isp\*
|
||||
|
||||
bin\components\addrbook.xpt
|
||||
bin\components\mime.xpt
|
||||
|
|
|
|||
|
|
@ -90,6 +90,16 @@ endif
|
|||
libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES))
|
||||
$(INSTALL) $^ $(FINAL_TARGET)
|
||||
|
||||
vpath %.rdf $(topsrcdir)/mailnews/base/ispdata
|
||||
|
||||
ISP_FILES = $(shell cat $(LOCALE_SRCDIR)/isp/isps.txt)
|
||||
|
||||
libs:: $(addsuffix .rdf,$(ISP_FILES))
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/isp/$(AB_CD)
|
||||
|
||||
install:: $(addsuffix .rdf,$(ISP_FILES))
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp/$(AB_CD)
|
||||
|
||||
libs-%:
|
||||
@$(MAKE) -C ../../toolkit/locales libs-$*
|
||||
@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
|
|
@ -163,6 +173,7 @@ repackage-zip: $(ZIP_IN)
|
|||
$(STAGEDIST)/defaults/pref/all-l10n.js
|
||||
$(RM) -r $(STAGEDIST)/searchplugins \
|
||||
$(STAGEDIST)/dictionaries \
|
||||
$(STAGEDIST)/isp/en-US \
|
||||
$(STAGEDIST)/chrome/en-US
|
||||
$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD)
|
||||
$(MAKE) libs-$(AB_CD)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
gmail
|
||||
|
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
EXPORT_DIR = $(DIST)/bin/isp
|
||||
|
||||
EXPORT_RESOURCE_FILES = gmail.rdf \
|
||||
EXPORT_RESOURCE_FILES = \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MOVEMAIL
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE RDF>
|
||||
<RDF:RDF
|
||||
xmlns:NC="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
|
||||
<RDF:Description about="NC:ispinfo">
|
||||
<NC:providers>
|
||||
<NC:nsIMsgAccount about="domain:googlemail.com">
|
||||
<!-- pop3 server info -->
|
||||
<NC:incomingServer>
|
||||
<NC:nsIMsgIncomingServer>
|
||||
<NC:prettyName>Google Mail</NC:prettyName>
|
||||
<NC:hostName>pop.googlemail.com</NC:hostName>
|
||||
<NC:type>pop3</NC:type>
|
||||
<NC:ServerType-pop3>
|
||||
<NC:nsIPopIncomingServer>
|
||||
<NC:leaveMessagesOnServer>true</NC:leaveMessagesOnServer>
|
||||
<NC:deleteMailLeftOnServer>false</NC:deleteMailLeftOnServer>
|
||||
</NC:nsIPopIncomingServer>
|
||||
</NC:ServerType-pop3>
|
||||
<NC:loginAtStartUp>true</NC:loginAtStartUp>
|
||||
<NC:downloadOnBiff>true</NC:downloadOnBiff>
|
||||
<NC:rememberPassword>true</NC:rememberPassword>
|
||||
<NC:port>995</NC:port>
|
||||
<NC:socketType>3</NC:socketType>
|
||||
</NC:nsIMsgIncomingServer>
|
||||
</NC:incomingServer>
|
||||
|
||||
<!-- smtp server info -->
|
||||
<NC:smtp>
|
||||
<NC:nsISmtpServer>
|
||||
<NC:hostname>smtp.googlemail.com</NC:hostname>
|
||||
<NC:port>587</NC:port>
|
||||
<NC:trySSL>2</NC:trySSL>
|
||||
<NC:description>Google Mail</NC:description>
|
||||
</NC:nsISmtpServer>
|
||||
</NC:smtp>
|
||||
<NC:smtpRequiresUsername>true</NC:smtpRequiresUsername>
|
||||
<NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
|
||||
<NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
|
||||
|
||||
<!-- identity defaults -->
|
||||
<NC:identity>
|
||||
<NC:nsIMsgIdentity>
|
||||
</NC:nsIMsgIdentity>
|
||||
</NC:identity>
|
||||
|
||||
<!-- other options -->
|
||||
<NC:wizardSkipPanels>true</NC:wizardSkipPanels>
|
||||
<NC:wizardShortName>Google Mail</NC:wizardShortName>
|
||||
<NC:wizardLongName>Google Mail</NC:wizardLongName>
|
||||
<NC:wizardShow>true</NC:wizardShow>
|
||||
<NC:wizardPromote>true</NC:wizardPromote>
|
||||
<NC:emailProviderName>Google Mail</NC:emailProviderName>
|
||||
<NC:sampleEmail>example@googlemail.com</NC:sampleEmail>
|
||||
<NC:sampleUserName>example</NC:sampleUserName>
|
||||
<NC:emailIDDescription>Google Mail Username:</NC:emailIDDescription>
|
||||
<NC:showServerDetailsOnWizardSummary>true</NC:showServerDetailsOnWizardSummary>
|
||||
</NC:nsIMsgAccount>
|
||||
</NC:providers>
|
||||
</RDF:Description>
|
||||
</RDF:RDF>
|
||||
|
|
@ -103,4 +103,4 @@ libs:: $(EXPORT_RESOURCE_FILES)
|
|||
$(INSTALL) $^ $(EXPORT_DIR)
|
||||
|
||||
install:: $(EXPORT_RESOURCE_FILES)
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/messenger
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче