bug 110946 install-script cleanup, r=curt,a=scc

This commit is contained in:
dveditz%netscape.com 2002-03-23 10:02:54 +00:00
parent 74c88d8460
commit 2cc7e2a657
15 changed files with 26 additions and 30 deletions

View File

@ -14,7 +14,7 @@ function upgradeCleanup()
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Seamonkey", "Browser", "$Version$");
var err = initInstall("Mozilla Navigator", "Browser", "$Version$");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
@ -83,7 +83,7 @@ if (verifyDiskSpace(fProgram, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
initInstall("Post-install Cleanup Utility", "xpicleanup", "$Version$");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "$Version$");
fEssentialFiles = getFolder(fProgram, "Essential Files");
cleanupUtility = getFolder(fEssentialFiles, "XPICleanup");
err = File.execute(cleanupUtility);

View File

@ -1,6 +1,6 @@
var srDest = $SpaceRequired$;
var err = initInstall("Venkman", "JavaScript Debugger", "$Version$");
var err = initInstall("JavaScript Debugger", "Venkman", "$Version$");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");

View File

@ -10,7 +10,7 @@ function upgradeCleanup()
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Seamonkey", "Browser", "$Version$");
var err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");

View File

@ -14,7 +14,7 @@ function upgradeCleanup()
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Seamonkey", "Seamonkey", "$Version$");
var err = initInstall("Mozilla Navigator", "Browser", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Program");
@ -80,7 +80,7 @@ if (verifyDiskSpace(communicatorFolder, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
initInstall("Post-install Cleanup Utility", "xpicleanup", "$Version$");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "$Version$");
cleanupUtility = getFolder(communicatorFolder, "xpicleanup");
err = File.execute(cleanupUtility);
logComment("execute() returned: " + err);

View File

@ -1,6 +1,6 @@
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Editor", "Seamonkey", "$Version$");
var err = initInstall("Mozilla Editor", "Editor", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Program");

View File

@ -7,7 +7,7 @@ function upgradeCleanup()
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Mail", "Seamonkey", "$Version$");
var err = initInstall("Mozilla Mail", "Mail", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Program");

View File

@ -1,15 +1,13 @@
function upgradeCleanup()
{
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
// Obsolete files that need to be cleaned up.
deleteThisFolder("Communicator", "psm");
}
var srDest = $SpaceRequired$;
var err;
err = initInstall("Netscape Personal Security Manager",
"Netscape Personal Security Manager", "$Version$");
err = initInstall("Personal Security Manager", "Personal Security Manager", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Communicator");

View File

@ -1,4 +1,4 @@
var err = initInstall("Talkback", "/FullCircle/TalkBack", "$Version$");
var err = initInstall("Quality Feedback Agent", "Quality Feedback Agent", "$Version$");
logComment("initInstall: " + err);
if (err==SUCCESS)

View File

@ -1,6 +1,6 @@
var srDest = $SpaceRequired$;
var err = initInstall("Venkman", "JavaScript Debugger", "$Version$");
var err = initInstall("JavaScript Debugger", "Venkman", "$Version$");
logComment("initInstall: " + err);
if (verifyDiskSpace(getFolder("Program"), srDest))

View File

@ -11,7 +11,7 @@ function upgradeCleanup()
var srDest = $SpaceRequired$;
var err = initInstall("Mozilla Seamonkey", "Seamonkey", "$Version$");
var err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Program");

View File

@ -232,7 +232,7 @@ function createShortcuts()
{
fTemp = fileExe;
fileExe = getFolder("file:///", fTemp);
newKey = fileExe + ' -turbo';
newKey = '"' + fileExe + '"' + ' -turbo';
winreg.createKey(subkey,"");
winreg.setValueString(subkey, valname, newKey);
}
@ -497,24 +497,22 @@ if(verifyDiskSpace(fProgram, srDest))
logComment("Installing: " + fProgram + "components\\xptitemp.dat");
logComment("Create Folder: " + fProgram + "chrome");
logComment("Installing: " + fProgram + "chrome\\installed-chrome.txt");
logComment("Installing: " + fProgram + "chrome\\all-locales.rdf");
logComment("Installing: " + fProgram + "chrome\\all-packages.rdf");
logComment("Installing: " + fProgram + "chrome\\all-skins.rdf");
logComment("Installing: " + fProgram + "chrome\\user-locales.rdf");
logComment("Installing: " + fProgram + "chrome\\user-skins.rdf");
logComment("Installing: " + fProgram + "chrome\\chrome.rdf");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\communicator");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\editor");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\messenger");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\communicator\\content");
logComment("Installing: " + fProgram + "chrome\\overlayinfo\\communicator\\content\\overlays.rdf");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\editor");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\editor\\content");
logComment("Installing: " + fProgram + "chrome\\overlayinfo\\editor\\content\\overlays.rdf");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\messenger");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\messenger\\content");
logComment("Installing: " + fProgram + "chrome\\overlayinfo\\messenger\\content\\overlays.rdf");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator\\content");
logComment("Installing: " + fProgram + "chrome\\overlayinfo\\navigator\\content\\overlays.rdf");
logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator\\skin");
logComment("Installing: " + fProgram + "chrome\\overlayinfo\\navigator\\skin\\stylesheets.rdf");
err = getLastError();
if (err == SUCCESS)
@ -524,7 +522,7 @@ if(verifyDiskSpace(fProgram, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
initInstall("Post-install Cleanup Utility", "xpicleanup", "$Version$");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "$Version$");
cleanupUtility = getFolder(fProgram, "xpicleanup.exe");
err = File.execute(cleanupUtility);
logComment("execute() returned: " + err);

View File

@ -1,6 +1,6 @@
$Ren8dot3List$
var err = initInstall("Mozilla Editor", "Seamonkey", "$Version$");
var err = initInstall("Mozilla Editor", "Editor", "$Version$");
logComment("initInstall: " + err);
var communicatorFolder = getFolder("Communicator");

View File

@ -372,10 +372,10 @@ sub MakeExeZip
$saveCwdir = cwd();
chdir($aSrcDir);
if(system("$ENV{MOZ_TOOLS}\\bin\\zip $inDistPath\\xpi\\$aZipFile $aExeFile"))
if(system("zip $inDistPath\\xpi\\$aZipFile $aExeFile"))
{
chdir($saveCwdir);
die "\n Error: $ENV{MOZ_TOOLS}\\bin\\zip $inDistPath\\xpi\\$aZipFile $aExeFile";
die "\n Error: zip $inDistPath\\xpi\\$aZipFile $aExeFile";
}
chdir($saveCwdir);
}

View File

@ -1,6 +1,6 @@
$Ren8dot3List$
var err = initInstall("Venkman", "JavaScript Debugger", "$Version$");
var err = initInstall("JavaScript Debugger", "Venkman", "$Version$");
logComment("initInstall: " + err);
$Ren8dot3Call$

View File

@ -101,7 +101,7 @@ var fileMsvcirt;
$Ren8dot3List$
srDest = $SpaceRequired$:bin;
err = initInstall("Mozilla XPCom", "XPCom", "$Version$");
err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");