From 66035b4e0361335ecd03bfdc7a5daf6dca2b5ac7 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com"
 <ssu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 25 May 2001 23:01:29 +0000
Subject: [PATCH] fixing bug 81601 - Left over files from 6.0/6.01 after
 updating to current build.  r=sgehani,sr=mscott,a=pdt2,drivers@mozilla.org. 
 affects only windows platforms.  not part of tinderbox builds.

git-svn-id: svn://10.0.0.236/trunk@95938 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpinstall/packager/windows/browser.jst    | 11 +++++-----
 mozilla/xpinstall/packager/windows/mail.jst   |  5 +++--
 mozilla/xpinstall/packager/windows/psm.jst    | 17 ++++++++--------
 mozilla/xpinstall/packager/windows/xpcom.jst  | 20 +++----------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/mozilla/xpinstall/packager/windows/browser.jst b/mozilla/xpinstall/packager/windows/browser.jst
index 9ca35087ad3..93a065c9741 100644
--- a/mozilla/xpinstall/packager/windows/browser.jst
+++ b/mozilla/xpinstall/packager/windows/browser.jst
@@ -284,11 +284,12 @@ function updateWinReg()
 
 function upgradeCleanup()
 {
-  // uncomment these function calls after beta1
-  // deleteThisFile("Program",    "oji.dll");
-  // deleteThisFile("Program",    "jsdom.dll");
-  // deleteThisFile("Program",    "defaults/pref/psm-glue.js");
-  // deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Program",    "oji.dll");
+  deleteThisFile("Program",    "jsdom.dll");
+  deleteThisFile("Program",    "defaults/pref/psm-glue.js");
+  deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");
   deleteThisFile("Components", "gkhtml.dll");
   deleteThisFile("Components", "mozucth.dll");
 }
diff --git a/mozilla/xpinstall/packager/windows/mail.jst b/mozilla/xpinstall/packager/windows/mail.jst
index 7d79ffa4b25..b2ad600b3a7 100644
--- a/mozilla/xpinstall/packager/windows/mail.jst
+++ b/mozilla/xpinstall/packager/windows/mail.jst
@@ -180,8 +180,9 @@ function createShortcuts()
 
 function upgradeCleanup()
 {
-  // uncomment this function call after beta1
-  // deleteThisFile("Components", "signed.dll");
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "signed.dll");
 }
 
 // main
diff --git a/mozilla/xpinstall/packager/windows/psm.jst b/mozilla/xpinstall/packager/windows/psm.jst
index 80e2a6e87de..7959a7bf49f 100644
--- a/mozilla/xpinstall/packager/windows/psm.jst
+++ b/mozilla/xpinstall/packager/windows/psm.jst
@@ -1,8 +1,14 @@
+function upgradeCleanup()
+{
+  // Obsolete files from Netscape 6.0 and Netscape 6.01 that
+  // need to be cleaned up.
+  deleteThisFile("Components", "psmglue.dll");
+}
+
 // main
 var srDest;
 var err;
 var fProgram;
-var target;
 
 $Ren8dot3List$
 
@@ -27,16 +33,11 @@ if(verifyDiskSpace(fProgram, srDest))
                      true);              // Force Flag 
   logComment("addDirectory() returned: " + err);
 
-  target = getFolder("Components", "psmglue.dll");
-  if (File.exists(target) > 0)
-  {
-      var rmErr = File.remove(target);
-      logComment("File.remove of " + target + " returned: " + rmErr);
-  }
-
   // check return value
   if(err == SUCCESS)
   {
+    upgradeCleanup();
+
     var pki = getFolder("Chrome", "pippki.jar");
     var nss = getFolder("Chrome", "pipnss.jar");
     registerChrome(CONTENT | DELAYED_CHROME, pki, "content/pippki/");
diff --git a/mozilla/xpinstall/packager/windows/xpcom.jst b/mozilla/xpinstall/packager/windows/xpcom.jst
index 5387f465cb1..fe15c5d6d76 100644
--- a/mozilla/xpinstall/packager/windows/xpcom.jst
+++ b/mozilla/xpinstall/packager/windows/xpcom.jst
@@ -81,23 +81,9 @@ function updateWinReg()
 
 function upgradeCleanup()
 {
-  var fComponentReg;
-  var fXpti;
-
-  fComponentReg = getFolder("Program", "component.reg");
-  logComment("Component.reg file: " + fComponentReg);
-  if(File.exists(fComponentReg))
-    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);
+  deleteThisFile("Program",    "component.reg");
+  deleteThisFile("Components", "xpti.dat");
+  deleteThisFile("Components", "xptitemp.dat");
 }
 
 // main