From 01ebb3f78f2e617809c30ddf76eddd0c0c8bbbe5 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com"
 <ssu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 24 May 2001 08:07:52 +0000
Subject: [PATCH] fixing bug 71010, which is part of a fix for bug 81601, which
 got pdt approval.  r=sgehani,sr=mscott,a=pdt2

git-svn-id: svn://10.0.0.236/trunk@95864 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/packager/common/share.t      | 17 +++++++++++++++++
 mozilla/xpinstall/packager/windows/browser.jst | 13 +++++++++++++
 mozilla/xpinstall/packager/windows/mail.jst    |  8 ++++++++
 3 files changed, 38 insertions(+)

diff --git a/mozilla/xpinstall/packager/common/share.t b/mozilla/xpinstall/packager/common/share.t
index bb0d1adba73..0c744d575bd 100644
--- a/mozilla/xpinstall/packager/common/share.t
+++ b/mozilla/xpinstall/packager/common/share.t
@@ -20,3 +20,20 @@ function verifyDiskSpace(dirPath, spaceRequired)
 
   return(true);
 }
+
+// this function deletes a file if it exists
+function deleteThisFile(dirKey, file)
+{
+  var fFileToDelete;
+
+  fFileToDelete = getFolder(dirKey, file);
+  logComment(file + " file: " + fFileToDelete);
+  if(File.exists(fFileToDelete))
+  {
+    fileDelete(fFileToDelete);
+    return(true);
+  }
+  else
+    return(false);
+}
+
diff --git a/mozilla/xpinstall/packager/windows/browser.jst b/mozilla/xpinstall/packager/windows/browser.jst
index 5ce23545243..9ca35087ad3 100644
--- a/mozilla/xpinstall/packager/windows/browser.jst
+++ b/mozilla/xpinstall/packager/windows/browser.jst
@@ -282,6 +282,17 @@ 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");
+  deleteThisFile("Components", "gkhtml.dll");
+  deleteThisFile("Components", "mozucth.dll");
+}
+
 // main
 var srDest;
 var err;
@@ -320,6 +331,8 @@ if(verifyDiskSpace(fProgram, srDest))
   {
     updateWinReg();
     createShortcuts();
+    upgradeCleanup();
+
     // we don't want to fail on errors for the above two
     resetError();
 
diff --git a/mozilla/xpinstall/packager/windows/mail.jst b/mozilla/xpinstall/packager/windows/mail.jst
index 940f5c0b5cb..7d79ffa4b25 100644
--- a/mozilla/xpinstall/packager/windows/mail.jst
+++ b/mozilla/xpinstall/packager/windows/mail.jst
@@ -178,6 +178,12 @@ function createShortcuts()
   }
 }
 
+function upgradeCleanup()
+{
+  // uncomment this function call after beta1
+  // deleteThisFile("Components", "signed.dll");
+}
+
 // main
 var srDest;
 var err;
@@ -210,6 +216,8 @@ if(verifyDiskSpace(fProgram, srDest))
   if( err == SUCCESS )
   {
     createShortcuts();
+    upgradeCleanup();
+
     // we don't want to fail on errors for the above
     resetError();