Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #235651 --> More windows installer work.

Browse Source 
Fix problems in regus.jst where we were not registering the US region chrome package.

Adjust how we handle the LICENSE file so it ends up as a .txt file when the user installs the app.

Register as a default news handler, including all of the news protocols into the windows registry.


git-svn-id: svn://10.0.0.236/trunk@153888 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-03-12 01:30:06 +00:00
parent 234b72a172
commit 4f1fe4788c
7 changed files with 114 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
mozilla/mail/LICENSE → mozilla/mail/LICENSE.txt
View File

2
mozilla/mail/app/Makefile.in
View File

@@ -229,4 +229,4 @@ README_FILE = $(topsrcdir)/README.txt
libs::
$(INSTALL) $(README_FILE) $(DIST)/bin
$(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin
$(INSTALL) $(topsrcdir)/mail/LICENSE.txt $(DIST)/bin

6
mozilla/mail/installer/windows/basemail-win
View File

@@ -36,11 +36,15 @@ thunderbird\components\jsd3250.dll
thunderbird\components\xpinstal.dll
thunderbird\mozz.dll
; Optional offline extension
[offline]
thunderbird\chrome\offline.jar
[mail]
thunderbird\xpicleanup.exe
thunderbird\thunderbird.exe
thunderbird\LICENSE
thunderbird\LICENSE.txt
thunderbird\README.txt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

20
mozilla/mail/installer/windows/config.it
View File

@@ -254,6 +254,7 @@ C2=Component Uninstaller
C3=Component US English Profile Defaults
C4=Component En US lang pack
C5=Component US region pack
C6=Component Offline
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
; C8=Component QFA
@@ -648,17 +649,16 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE|MAIN_COMPONENT
Force Upgrade File0=[SETUP PATH]\$MainExeFile$
FileCount=$FileCount$
;[Component ADT]
;Description Short=Developer Tools
[Component Offline]
Description Short=Offline Support
;*** LOCALIZE ME BABY ***
;Description Long=Tools for web developers including an error console, the Document Inspector and a JavaScript Debugger.
;Archive=adt.xpi
;$InstallSize$:adt
;$InstallSizeArchive$:adt.xpi
;Attributes=FORCE_UPGRADE|VISIBLE
;Force Upgrade File0=[SETUP PATH]\chrome\venkman.jar
;Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar
;FileCount=$FileCount$
Description Long=Adds Offline support to $ProductName$ Mail.
Archive=offline.xpi
$InstallSize$:offline
$InstallSizeArchive$:offline.xpi
Attributes=FORCE_UPGRADE|VISIBLE
Force Upgrade File0=[SETUP PATH]\chrome\offline.jar
FileCount=$FileCount$
[Component Uninstaller]
Description Short=$CompanyName$ Uninstaller

4
mozilla/mail/installer/windows/installer.cfg
View File

@@ -10,5 +10,5 @@ FileMainEXE = thunderbird.exe
FileUninstall = UninstallThunderbird.exe
FileUninstallZIP = UninstallThunderbird.zip
FileInstallerNETRoot = ThunderbirdNetSetup
ComponentList = xpcom,mail,deflenus,langenus,regus
LicenseFile = mail/LICENSE
ComponentList = xpcom,mail,deflenus,langenus,regus,offline
LicenseFile = mail/LICENSE.txt

105
mozilla/mail/installer/windows/mail.jst
View File

@@ -58,7 +58,7 @@ function createShortcuts()
fTemp = fProgram + "$MainExeFile$";
fileExe = getFolder("file:///", fTemp);
fileReadme = getFolder("file:///", fProgram + "readme.txt");
fileLicense = getFolder("file:///", fProgram + "license");
fileLicense = getFolder("file:///", fProgram + "license.txt");
scExeDesc = "$ProductName$";
scReadmeDesc = "Readme";
scLicenseDesc = "License";
@@ -275,20 +275,72 @@ function updateMapi()
winreg.createKey(subkey + "\\DefaultIcon", "");
winreg.setValueString(subkey + "\\DefaultIcon", "", sfpMainExePath + ",0");
// Register mailto protocol handler
winreg.createKey(subkey + "\\protocols", "");
winreg.createKey(subkey + "\\protocols\\mailto", "");
winreg.setValueString(subkey + "\\protocols\\mailto", "", "URL:MailTo Protocol");
winreg.setValueString(subkey + "\\protocols\\mailto", "URL Protocol", "");
winreg.createKey(subkey + "\\protocols\\mailto\\shell", "");
winreg.createKey(subkey + "\\protocols\\mailto\\shell\\open", "");
winreg.createKey(subkey + "\\protocols\\mailto\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\protocols\\mailto\\shell\\open\\command", "", sfpMainExePath + " \"%1\"");
winreg.setValueString(subkey + "\\protocols\\mailto\\shell\\open\\command", "", sfpMainExePath + " -compose \"%1\"");
winreg.createKey(subkey + "\\protocols\\mailto\\DefaultIcon", "");
winreg.setValueString(subkey + "\\protocols\\mailto\\DefaultIcon", sfpMainExePath + ",0");
// register shell open command for Mozilla Thunderbird product key under \Mail
winreg.createKey(subkey + "\\shell", "");
winreg.createKey(subkey + "\\shell\\open", "");
winreg.createKey(subkey + "\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\shell\\open\\command", "", sfpMainExePath);
// Register Thunderbird as a News Reader
subkey = "SOFTWARE\\Clients\\News\\$ProductName$";
winreg.createKey(subkey, "");
winreg.setValueString(subkey, "", mailDefaultDescription);
winreg.setValueString(subkey, "DLLPath", sfpProgramMozMapi32File);
winreg.createKey(subkey + "\\DefaultIcon", "");
winreg.setValueString(subkey + "\\DefaultIcon", "", sfpMainExePath + ",0");
// register shell open command for Mozilla Thunderbird product key under \News
winreg.createKey(subkey + "\\shell", "");
winreg.createKey(subkey + "\\shell\\open", "");
winreg.createKey(subkey + "\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\shell\\open\\command", "", sfpMainExePath);
// Register News protocol handlers (news, snews, nntp)
winreg.createKey(subkey + "\\protocols", "");
winreg.createKey(subkey + "\\protocols\\news", "");
winreg.setValueString(subkey + "\\protocols\\news", "", "URL:News Protocol");
winreg.setValueString(subkey + "\\protocols\\news", "URL Protocol", "");
winreg.createKey(subkey + "\\protocols\\news\\shell", "");
winreg.createKey(subkey + "\\protocols\\news\\shell\\open", "");
winreg.createKey(subkey + "\\protocols\\news\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\protocols\\news\\shell\\open\\command", "", sfpMainExePath + " -mail \"%1\"");
winreg.createKey(subkey + "\\protocols\\news\\DefaultIcon", "");
winreg.setValueString(subkey + "\\protocols\\news\\DefaultIcon", sfpMainExePath + ",0");
winreg.createKey(subkey + "\\protocols\\nntp", "");
winreg.setValueString(subkey + "\\protocols\\nntp", "", "URL:NNTP Protocol");
winreg.setValueString(subkey + "\\protocols\\nntp", "URL Protocol", "");
winreg.createKey(subkey + "\\protocols\\nntp\\shell", "");
winreg.createKey(subkey + "\\protocols\\nntp\\shell\\open", "");
winreg.createKey(subkey + "\\protocols\\nntp\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\protocols\\nntp\\shell\\open\\command", "", sfpMainExePath + " -mail \"%1\"");
winreg.createKey(subkey + "\\protocols\\nntp\\DefaultIcon", "");
winreg.setValueString(subkey + "\\protocols\\nntp\\DefaultIcon", sfpMainExePath + ",0");
winreg.createKey(subkey + "\\protocols\\snews", "");
winreg.setValueString(subkey + "\\protocols\\snews", "", "URL:Snews Protocol");
winreg.setValueString(subkey + "\\protocols\\snews", "URL Protocol", "");
winreg.createKey(subkey + "\\protocols\\snews\\shell", "");
winreg.createKey(subkey + "\\protocols\\snews\\shell\\open", "");
winreg.createKey(subkey + "\\protocols\\snews\\shell\\open\\command", "");
winreg.setValueString(subkey + "\\protocols\\snews\\shell\\open\\command", "", sfpMainExePath + " -mail \"%1\"");
winreg.createKey(subkey + "\\protocols\\snews\\DefaultIcon", "");
winreg.setValueString(subkey + "\\protocols\\snews\\DefaultIcon", sfpMainExePath + ",0");
// Register MapiProxy.dll
mapiProxyFile = getFolder("Program", "MapiProxy.dll");
err = File.windowsRegisterServer(mapiProxyFile);
@@ -397,10 +449,7 @@ function updateWinReg()
}
function upgradeCleanup()
{
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
{
// For now, since we're new, we have no such files.
}
@@ -520,11 +569,6 @@ if(verifyDiskSpace(fProgram, srDest))
logComment("Installing: " + fProgram + "components\\xpti.dat");
logComment("Installing: " + fProgram + "components\\xptitemp.dat");
logComment("Installing: " + fProgram + "components\\compreg.dat");
logComment("Create Folder: " + fProgram + "components\\Netscape");
logComment("Create Folder: " + fProgram + "components\\Netscape\\MozillaTrunk");
logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\manifest.ini");
logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\permdata.box");
logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\Talkback.ini");
logComment("Create Folder: " + fProgram + "chrome");
logComment("Installing: " + fProgram + "chrome\\installed-chrome.txt");
logComment("Installing: " + fProgram + "chrome\\chrome.rdf");
@@ -555,6 +599,7 @@ if(verifyDiskSpace(fProgram, srDest))
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto\\DefaultIcon []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto\\shell []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto\\shell\\open []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\protocols\\mailto\\shell\\open\\command []");
@@ -564,6 +609,42 @@ if(verifyDiskSpace(fProgram, srDest))
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\shell\\open\\command []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\$ProductName$\\shell\\open\\command []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$ []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$ []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$ [DLLPath]");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\DefaultIcon []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\DefaultIcon []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news\\DefaultIcon []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news\\shell []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news\\shell\\open []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news\\shell\\open\\command []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\news\\shell\\open\\command []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews\\DefaultIcon []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews\\shell []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews\\shell\\open []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews\\shell\\open\\command []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\snews\\shell\\open\\command []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp\\DefaultIcon []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp\\shell []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp\\shell\\open []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp\\shell\\open\\command []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\protocols\\nntp\\shell\\open\\command []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\shell []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\shell\\open []");
logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\shell\\open\\command []");
logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\News\\$ProductName$\\shell\\open\\command []");
err = getLastError();
if (err == SUCCESS)
{

6
mozilla/mail/installer/windows/regus.jst
View File

@@ -7,13 +7,13 @@ var platformNode = getPlatform();
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "US Region Pack";
var langcode = "en";
var chromeNode = langcode + "-US";
var chromeNode = "US";
var lang = "en-US"
// --- END CHANGABLE STUFF ---
var regName = "locales/mozilla/" + chromeNode;
var chromeName = chromeNode + "-mail.jar";
var chromeName = lang + "-mail.jar";
var localeName = "locale/" + chromeNode + "/";
srDest = $SpaceRequired$:thunderbird;