Fix for 81523 and 81515. Checking in for ssu, see details in the bug reports.

r=sgehani, rs/sr=mscott, a=chofmann

xpinstall/packager/common/share.t

@@ -37,3 +37,19 @@ function deleteThisFile(dirKey, file)
     return(false);
 }
 
+// this function deletes a folder (recursively) if it exists
+function deleteThisFolder(dirKey, folder)
+{
+  var fToDelete;
+
+  fToDelete = getFolder(dirKey, folder);
+  logComment(folder + " folder: " + fToDelete);
+  if(folder.exists(fToDelete, true))
+  {
+    File.dirRemove(fToDelete);
+    return(true);
+  }
+  else
+    return(false);
+}
+

xpinstall/packager/mac/browser.jst

@@ -1,3 +1,18 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "browser.xpt");
+  deleteThisFile("Components", "DOMDataSource.shlb");
+  deleteThisFile("Components", "PSMGlue.shlb");
+  deleteThisFile("Components", "ucth.shlb");
+  deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");
+  deleteThisFile("Program",    "Essential Files/PSM.shlb");
+  deleteThisFolder("Program",  "psmdata");
+  deleteThisFolder("Program",  "res/samples");
+  deleteThisFolder("Program",  "res/throbber");
+}
+
 var srDest = $SpaceRequired$;
 
 var err = initInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
@@ -8,6 +23,10 @@ logComment("fProgram: " + fProgram);
 
 if (verifyDiskSpace(fProgram, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                        "$Version$",
                        "viewer",           // jar source folder

xpinstall/packager/mac/mail.jst

@@ -1,3 +1,11 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "mail.xpt");
+  deleteThisFile("Components", "signed.shlb");
+}
+
 var srDest = $SpaceRequired$;
 
 var err = initInstall("Mozilla Mail", "Mail", "$Version$"); 
@@ -8,6 +16,10 @@ logComment("fProgram: " + fProgram);
 
 if (verifyDiskSpace(fProgram, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                    "$Version$",
                    "viewer",           // jar source folder 

xpinstall/packager/mac/xpcom.jst

@@ -1,22 +1,11 @@
 function upgradeCleanup()
 {
-  var fComponentReg;
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
-  var fXpti;
+  // need to be cleaned up.
-
+  deleteThisFile("Program",    "Component Registry");
-  fComponentReg = getFolder("Program", "Component Registry");
+  deleteThisFile("Program",    "Essential Files/dom.shlb");
-  logComment("Component Registry file: " + fComponentReg);
+  deleteThisFile("Components", "xpti.dat");
-  if(File.exists(fComponentReg))
+  deleteThisFile("Components", "xptitemp.dat");
-    fileDelete(fComponentReg);
-
-  fXpti = getFolder("Components", "xpti.dat");
-  logComment("xpti.dat file: " + fXpti);
-  if(File.exists(fXpti))
-    fileDelete(fXpti);
-
-  fXpti = getFolder("Components", "xptitemp.dat");
-  logComment("xptitemp.dat file: " + fXpti);
-  if(File.exists(fXpti))
-    fileDelete(fXpti);
 }
 
 var srDest = $SpaceRequired$;
@@ -31,6 +20,10 @@ var subFolder = "Mozilla Folder";
 
 if (verifyDiskSpace(fProgram, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                    "$Version$",
                    "viewer",           // jar source folder 
@@ -42,7 +35,6 @@ if (verifyDiskSpace(fProgram, srDest))
 
     if (err==SUCCESS)
     {
-      upgradeCleanup();
 	    err = performInstall(); 
     	logComment("performInstall() returned: " + err);
     }

xpinstall/packager/unix/browser.jst

@@ -1,3 +1,17 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "libmozucth.so");
+  deleteThisFile("Components", "libpsmglue.so");
+  deleteThisFile("Components", "libsample.so");
+  deleteThisFile("Components", "nsSample.js");
+  deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");
+  deleteThisFile("Program",    "libcmt.so");
+  deleteThisFile("Program",    "libjpeg.so");
+  deleteThisFile("Program",    "libprotocol.so");
+}
+
 var srDest = $SpaceRequired$;
 
 var err = initInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); 
@@ -8,6 +22,10 @@ logComment("communicatorFolder: " + communicatorFolder);
 
 if (verifyDiskSpace(communicatorFolder, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                        "$Version$",
                        "bin",              // jar source folder

xpinstall/packager/unix/mail.jst

@@ -1,3 +1,10 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "libsigned.so");
+}
+
 var srDest = $SpaceRequired$;
 
 var err = initInstall("Mozilla Mail", "Seamonkey", "$Version$"); 
@@ -8,6 +15,10 @@ logComment("communicatorFolder: " + communicatorFolder);
 
 if (verifyDiskSpace(communicatorFolder, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                        "$Version$",
                        "bin",              // jar source folder 

xpinstall/packager/unix/psm.jst

@@ -1,3 +1,10 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFolder("Communicator", "psm");
+}
+
 var srDest = $SpaceRequired$;
 var err;
 
@@ -10,6 +17,10 @@ logComment("communicatorFolder: " + communicatorFolder);
 
 if(verifyDiskSpace(communicatorFolder, srDest))
 {
+  // Call upgradeCleanup() before addDirectory() in case we accidentaly
+  // delete files that we happen to be also installing.  This way, if we do,
+  // it will just get reinstalled.  This is for safety measure.
+  upgradeCleanup();
   err = addDirectory("Program",          // reg entry
                      "$Version$",        // version
                      "bin",              // jar source

xpinstall/packager/unix/xpcom.jst

@@ -1,22 +1,12 @@
 function upgradeCleanup()
 {
-  var fComponentReg;
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
-  var fXpti;
+  // need to be cleaned up.
-
+  deleteThisFile("Program",    "component.reg");
-  fComponentReg = getFolder("Program", "component.reg");
+  deleteThisFile("Program",    "libjsdom.so");
-  logComment("component.reg file: " + fComponentReg);
+  deleteThisFile("Program",    "libz.so");
-  if(File.exists(fComponentReg))
+  deleteThisFile("Components", "xpti.dat");
-    fileDelete(fComponentReg);
+  deleteThisFile("Components", "xptitemp.dat");
-
-  fXpti = getFolder("Components", "xpti.dat");
-  logComment("xpti.dat file: " + fXpti);
-  if(File.exists(fXpti))
-    fileDelete(fXpti);
-
-  fXpti = getFolder("Components", "xptitemp.dat");
-  logComment("xptitemp.dat file: " + fXpti);
-  if(File.exists(fXpti))
-    fileDelete(fXpti);
 }
 
 var srDest = $SpaceRequired$;
@@ -29,6 +19,10 @@ logComment("communicatorFolder: " + communicatorFolder);
 
 if (verifyDiskSpace(communicatorFolder, srDest))
 {
+    // Call upgradeCleanup() before addDirectory() in case we accidentaly
+    // delete files that we happen to be also installing.  This way, if we do,
+    // it will just get reinstalled.  This is for safety measure.
+    upgradeCleanup();
     err = addDirectory("Program",
                        "$Version$",
                        "bin",              // jar source folder 
@@ -40,7 +34,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
 
     if (err==SUCCESS)
     {
-      upgradeCleanup();
 	    err = performInstall(); 
 	    logComment("performInstall() returned: " + err);
     }