Making the uninstaller work...

browser/installer/windows/browser.jst

@@ -466,6 +466,9 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-platform/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/");
 
+    // Create the uninstall folder. 
+    err = File.dirCreate(getFolder("Program", "uninstall"));
+    logComment("dirCreate() of Program/uninstall returned: " + err);
 
     // We need to register the psm chrome files.
     // We're checking to see if they exist first in case
@@ -515,6 +518,7 @@ if(verifyDiskSpace(fProgram, srDest))
     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");
+    logComment("Create Folder: " + fProgram + "uninstall");
 
     err = getLastError();
     if (err == SUCCESS)

browser/installer/windows/config.it

@@ -845,7 +845,7 @@ Strip Filename=FALSE
 
 ;Copy File SequentialX sections
 [Copy File Sequential0]
-Timing=post launchapp
+Timing=post smartupdate
 Filename=install_wizard.log
 Source=[SETUP PATH]
 Destination=[SETUP PATH]\uninstall
@@ -863,7 +863,7 @@ Timing=post download
 Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk
 
 [Delete File1]
-Timing=post launchapp
+Timing=post smartupdate
 Destination=[SETUP PATH]\install_wizard.log
 
 

toolkit/mozapps/installer/windows/build_static.pl

@@ -19,6 +19,9 @@
 #
 # Contributor(s): Sean Su
 #
+#
+#  Next Generation Apps Version:
+#     Ben Goodger <ben@mozilla.org>
 
 #
 # Purpose:

toolkit/mozapps/installer/windows/makeall.pl

@@ -21,6 +21,9 @@
 # Contributor(s): 
 # Sean Su <ssu@netscape.com>
 # 
+#
+#  Next Generation Apps Version:
+#     Ben Goodger <ben@mozilla.org>
 
 #
 # This perl script builds the xpi, config.ini, and js files.

toolkit/mozapps/installer/windows/wizard/setup/ifuncns.c

@@ -858,14 +858,6 @@ HRESULT FileCopySequential(LPSTR szSourcePath, LPSTR szDestPath, LPSTR szFilenam
       lstrcat(szDestFullFilename, szFilenameExtensionOnly);
     }
 
-    // XXXben (11/06/2003) - I'm not sure if this is exactly the right fix
-    // for the uninstall log not being copied to the new location - this 
-    // certainly works in Seamonkey's installer, but it seems like an obvious
-    // and convenient band-aid. 
-    // Create the folder if it does not exist. 
-    if (GetFileAttributes(szDestPath) != FILE_ATTRIBUTE_DIRECTORY)
-      CreateDirectory(szDestPath, NULL);
-
     CopyFile(szSourceFullFilename, szDestFullFilename, TRUE);
   }