updating install build scripts to correctly set the uninstall.exe file size. Not part of tinderbox build. would affect only windows platforms

xpinstall/packager/windows/config.it

@@ -314,7 +314,7 @@ Server Path0=$ServerPath$
 Description Short=$CompanyName$ Uninstaller
 Description Long=Uninstaller for $ProductName$
 Archive=$UninstallFile$
-Install Size=0
+$InstallSize$:$UninstallFile$
 $InstallSizeArchive$:$UninstallFile$
 ;Dependency0=
 ; Attributes can be the following values:

xpinstall/packager/windows/makeall.pl

@@ -80,19 +80,6 @@ else
   mkdir ("$inDistPath\\xpi",0775);
 }
 
-# Make .js files
-MakeJsFile("xpcom");
-MakeJsFile("browser");
-MakeJsFile("mail");
-
-# Make .xpi files
-MakeXpiFile("xpcom");
-MakeXpiFile("browser");
-MakeXpiFile("mail");
-
-MakeConfigFile();
-MakeUninstallIniFile();
-
 if(-e "$inDistPath\\uninstall")
 {
   unlink <$inDistPath\\uninstall\\*>;
@@ -111,10 +98,18 @@ else
   mkdir ("$inDistPath\\setup",0775);
 }
 
-# Copy the uninstall files to the dist uninstall directory.
-system("copy uninstall.ini              $inDistPath");
-system("copy uninstall.ini              $inDistPath\\uninstall");
-system("copy $inDistPath\\uninstall.exe $inDistPath\\uninstall");
+# Make .js files
+MakeJsFile("xpcom");
+MakeJsFile("browser");
+MakeJsFile("mail");
+
+# Make .xpi files
+MakeXpiFile("xpcom");
+MakeXpiFile("browser");
+MakeXpiFile("mail");
+
+MakeUninstall();
+MakeConfigFile();
 
 # Copy the setup files to the dist setup directory.
 system("copy config.ini                 $inDistPath");
@@ -122,12 +117,6 @@ system("copy config.ini                 $inDistPath\\setup");
 system("copy $inDistPath\\setup.exe     $inDistPath\\setup");
 system("copy $inDistPath\\setuprsc.dll  $inDistPath\\setup");
 
-# build the self-extracting .exe (uninstaller) file.
-print "\nbuilding self-extracting uninstaller ($seuFileNameSpecific)...\n";
-system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seuFileNameSpecific");
-system("$inDistPath\\nszip.exe $inDistPath\\$seuFileNameSpecific $inDistPath\\uninstall\\*.*");
-system("copy $inDistPath\\$seuFileNameSpecific $inDistPath\\xpi");
-
 # build the self-extracting .exe (installer) file.
 print "\nbuilding self-extracting installer ($seiFileNameSpecific)...\n";
 system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecific");
@@ -147,6 +136,22 @@ sub MakeConfigFile
   }
 }
 
+sub MakeUninstall
+{
+  MakeUninstallIniFile();
+
+  # Copy the uninstall files to the dist uninstall directory.
+  system("copy uninstall.ini              $inDistPath");
+  system("copy uninstall.ini              $inDistPath\\uninstall");
+  system("copy $inDistPath\\uninstall.exe $inDistPath\\uninstall");
+
+  # build the self-extracting .exe (uninstaller) file.
+  print "\nbuilding self-extracting uninstaller ($seuFileNameSpecific)...\n";
+  system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seuFileNameSpecific");
+  system("$inDistPath\\nszip.exe $inDistPath\\$seuFileNameSpecific $inDistPath\\uninstall\\*.*");
+  system("copy $inDistPath\\$seuFileNameSpecific $inDistPath\\xpi");
+}
+
 sub MakeUninstallIniFile
 {
   # Make config.ini file

xpinstall/packager/windows/makecfgini.pl

@@ -126,14 +126,21 @@ while($line = <fpInIt>)
       $componentName    = $colonSplit[1];
       chop($componentName);
 
-      $installSize      = OutputInstallSize("$inStagePath\\$componentName");
-
-      # special oji consideration here.  Since it's an installer that 
-      # seamonkey installer will be calling, the disk space allocation
-      # needs to be adjusted by an expansion factor of 3.62.
-      if($componentName =~ /oji/i)
+      if($componentName =~ /\$UninstallFile\$/i)
       {
-        $installSize = int($installSize * 3.62);
+        $installSize = OutputInstallSizeArchive("$inXpiPath\\$fileUninstall");
+      }
+      else
+      {
+        $installSize = OutputInstallSize("$inStagePath\\$componentName");
+
+        # special oji consideration here.  Since it's an installer that 
+        # seamonkey installer will be calling, the disk space allocation
+        # needs to be adjusted by an expansion factor of 3.62.
+        if($componentName =~ /oji/i)
+        {
+          $installSize = int($installSize * 3.62);
+        }
       }
     }