Bug #253490 --> Installer support for the RSS component.

Bug #253617 --> Options / General panel on Windows won't remember any settings. Synch the installer with the messenger-mapi
chrome locaton changes made for GNOME mapi support.
This commit is contained in:
scott%scott-macgregor.org 2004-07-30 21:54:51 +00:00
parent 0c88d9b652
commit be313edc35
11 changed files with 73 additions and 41 deletions

View File

@ -14,6 +14,8 @@ locale/en-US/messenger/addressbook, en-US/locale/en-US/mes
locale/en-US/messenger/messengercompose, en-US/locale/en-US/messenger/messengercompose
locale/en-US/messenger/migration, en-US/locale/en-US/messenger/migration
locale/en-US/messenger-smime, en-US/locale/en-US/messenger-smime
locale/en-US/messenger-mapi, en-US/locale/en-US/messenger-mapi
locale/en-US/messenger-newsblog, en-US/locale/en-US/messenger-newsblog
#################################################################################################
# xpfe extensions (ldap, wallet, etc)

View File

@ -39,6 +39,7 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mdn/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-views/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-smime/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/messenger-region/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/necko/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/editor/
@ -50,18 +51,15 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/global/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/global-region/
#ifdef XP_WIN
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/
#else
#ifdef XP_OS2
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/
#else
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/
#endif
@ -79,3 +77,8 @@ content,install,url,jar:resource:/chrome/offline.jar!/content/messenger-offline/
locale,install,url,jar:resource:/chrome/offline.jar!/content/messenger-offline/
locale,install,url,jar:resource:/chrome/offline.jar!/locale/en-US/messenger-offline/
skin,install,url,jar:resource:/chrome/offline.jar!/content/messenger-offline/
# optional registration for RSS support which may or may not be installed
content,install,url,jar:resource:/chrome/newsblog.jar!/content/messenger-newsblog/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-newsblog/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/messenger-newsblog/

View File

@ -16,6 +16,7 @@ skin/classic/messenger/addressbook/icons, classic/skin/classic/messen
skin/classic/messenger/messengercompose, classic/skin/classic/messenger/messengercompose
skin/classic/messenger/smime, classic/skin/classic/messenger/smime
skin/classic/messenger/smime/icons, classic/skin/classic/messenger/smime/icons
skin/classic/messenger-newsblog, classic/skin/classic/messenger-newsblog
icon.png, classic/icon.png
#################################################################################################
@ -90,3 +91,4 @@ skin/classic/editor/icons/img-align-left.gif, classic/skin/classic/edito
skin/classic/editor/icons/img-align-middle.gif, classic/skin/classic/editor/icons/img-align-middle.gif
skin/classic/editor/icons/img-align-right.gif, classic/skin/classic/editor/icons/img-align-right.gif
skin/classic/editor/icons/img-align-top.gif, classic/skin/classic/editor/icons/img-align-top.gif

View File

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = offline
DIRS = offline newsblog
ifdef MOZ_PSM
BUILD_SMIME=1

View File

@ -14,7 +14,8 @@
chrome:author="Team Thunderbird"
chrome:name="messenger-newsblog"
chrome:description="This extension adds the ability to read news and blog feeds to Mozilla Thunderbird."
chrome:extension="true">
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
</RDF:Description>
<!-- overlay information -->

View File

@ -14,7 +14,7 @@ newsblog.jar:
* content/messenger-newsblog/am-newsblog.js (content/am-newsblog.js)
* content/messenger-newsblog/contents.rdf (content/contents.rdf)
newsblog.jar:
en-US.jar:
locale/en-US/messenger-newsblog/newsblog.dtd (locale/newsblog.dtd)
locale/en-US/messenger-newsblog/newsblog.properties (locale/newsblog.properties)
locale/en-US/messenger-newsblog/feed-properties.dtd (locale/feed-properties.dtd)

View File

@ -41,6 +41,12 @@ bin\components\xpinstal.dll
[offline]
bin\chrome\offline.jar
; Optional RSS extension
[newsblog]
bin\chrome\newsblog.jar
bin\defaults\isp\rss.rdf
bin\components\newsblog.js
; Optional Talkback
[talkback]
bin\components\qfaservices.dll

View File

@ -235,9 +235,10 @@ C2=Component Uninstaller
C3=Component US English Profile Defaults
C4=Component En US lang pack
C5=Component US region pack
C6=Component RSS
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C6=Component QFA
C7=Component QFA
[Setup Type1]
;*** LOCALIZE ME BABY ***
@ -255,10 +256,11 @@ C3=Component US English Profile Defaults
C4=Component En US lang pack
C5=Component US region pack
C6=Component Offline
C7=Component RSS
;C7=Component ADT
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C7=Component QFA
C8=Component QFA
[Dialog Select Components]
Show Dialog=TRUE
@ -477,7 +479,7 @@ Message Retry0=Some files have failed the CRC check and are being downloaded aga
Show Dialog=AUTO
[Check Instance0]
Class Name=MozillaMessageWindow
Class Name=ThunderbirdMessageWindow
Window Name=
Process Name=$MainExeFile$
Pretty Name=$ProductNameInternal$
@ -499,36 +501,6 @@ Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\$MainExeF
Extra Cmd0 Reg Name=
Extra Cmd0 Parameter=-kill
[Check Instance1]
Class Name=Netscape6MessageWindow
Window Name=
Process Name=Netscp.exe
Pretty Name=Netscape
;*** LOCALIZE ME BABY ***
Message=Download of $ProductName$ was successful. However, Netscape must be closed to proceed with this installation. Click OK to exit Netscape automatically and to begin installation.
;*** LOCALIZE ME BABY ***
Message Full Installer=Netscape must be closed to proceed with this installation. Click OK to exit Netscape automatically and to begin installation.
;*** LOCALIZE ME BABY ***
Message wait=Shutting down Netscape. Please wait...
; This key indicates whether or not to close all the windows associated with
; the process id of this app instance window found.
Close All Process Windows=TRUE
; These keys are not normally necessary for checking instances. They are
; set here because Netscape 6 requires a way to shut down it's turbo mode.
; This will stop at the first one that succeeds (key and file found).
Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE
Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Netscp6.exe
Extra Cmd0 Reg Name=
Extra Cmd0 Parameter=-kill
Extra Cmd1 Reg Key Root=HKEY_LOCAL_MACHINE
Extra Cmd1 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Netscp.exe
Extra Cmd1 Reg Name=
Extra Cmd1 Parameter=-kill
;DependeeX=Component A means
; - if Component A gets checked this component gets checked
; - if Component A gets unchecked this component gets unchecked
@ -657,6 +629,17 @@ Attributes=FORCE_UPGRADE|VISIBLE
Force Upgrade File0=[SETUP PATH]\chrome\offline.jar
FileCount=$FileCount$
[Component RSS]
Description Short=RSS Support
;*** LOCALIZE ME BABY ***
Description Long=Adds RSS support to $ProductName$ Mail.
Archive=newsblog.xpi
$InstallSize$:newsblog
$InstallSizeArchive$:newsblog.xpi
Attributes=FORCE_UPGRADE|VISIBLE
Force Upgrade File0=[SETUP PATH]\chrome\newsblog.jar
FileCount=$FileCount$
;[Component ADT]
;Description Short=Developer Tools
;*** LOCALIZE ME BABY ***

View File

@ -11,6 +11,6 @@ FileMainEXE = thunderbird.exe
FileUninstall = UninstallThunderbird.exe
FileUninstallZIP = UninstallThunderbird.zip
FileInstallerNETRoot = ThunderbirdNetSetup
ComponentList = xpcom,mail,talkback,deflenus,langenus,regus,offline
ComponentList = xpcom,mail,talkback,deflenus,langenus,regus,offline,newsblog
LicenseFile = mail/LICENSE.txt
7ZipSFXModule = other-licenses/7zstub/thunderbird/7zSD.sfx

View File

@ -70,9 +70,11 @@ if(verifyDiskSpace(fProgram, srDest))
registerChrome(chromeType, cf, localeName + "messenger-mdn/");
registerChrome(chromeType, cf, localeName + "messenger-views/");
registerChrome(chromeType, cf, localeName + "messenger-smime/");
registerChrome(chromeType, cf, localeName + "messenger-newsblog/");
registerChrome(chromeType, cf, localeName + "messenger/");
registerChrome(chromeType, cf, localeName + "editor/");
registerChrome(chromeType, pf, localeName + "messenger-mapi/");
registerChrome(chromeType, cf, localeName + "messenger-mapi/");
registerChrome(chromeType, cf, localeName + "communicator/");
registerChrome(chromeType, pf, localeName + "communicator-platform/");

View File

@ -0,0 +1,33 @@
var err = initInstall("RSS Support", "RSS", "$Version$");
logComment("initInstall: " + err);
// RSS Extension
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "$Version$", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
var jarFolder = getFolder("Chrome", "newsblog.jar");
fTarget = getFolder("Program", "defaults");
logComment("fTarget: " + fTarget);
err = addDirectory("",
"bin/defaults", // dir name in jar to extract
fTarget, // Where to put this file (Returned from GetFolder)
""); // subdir name to create relative to fProgram
addFile("RSS Service",
"bin/components/newsblog.js",
getFolder("Components"),
"");
registerChrome(CONTENT | DELAYED_CHROME, jarFolder, "content/messenger-newsblog/");
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/messenger-newsblog/");
err = getLastError();
if (err==SUCCESS)
performInstall();
else
cancelInstall(err);