From c9980324d94cf54423832e8ab5253a8da29fc6c2 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com" <ssu%netscape.com>
Date: Fri, 18 Feb 2000 06:10:23 +0000
Subject: [PATCH] fixing bug #23658.  It now calculates the correct amount of
 disk space required for the install to take place.

not part of build
affects only windows

a=chofmann
r=pavlov
---
 xpinstall/packager/windows/makecfgini.pl | 6 ++++--
 xpinstall/packager/windows/makejs.pl     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xpinstall/packager/windows/makecfgini.pl b/xpinstall/packager/windows/makecfgini.pl
index 1d8b80ba1578..f8df5b1c0f92 100644
--- a/xpinstall/packager/windows/makecfgini.pl
+++ b/xpinstall/packager/windows/makecfgini.pl
@@ -157,7 +157,8 @@ sub OutputInstallSize()
   my($installSize);
 
   print "   calculating size for $inPath\n";
-  $installSize    = `ds32.exe /L0 /A /S /C 32768 $inPath`;
+  $installSize    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
+  $installSize   += 32768; # take into account install.js
   $installSize    = int($installSize / 1024);
   $installSize   += 1;
   return($installSize);
@@ -171,6 +172,7 @@ sub OutputInstallSizeArchive()
 
   print "   calculating size for $inPath\n";
   ($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat $inPath;
+  $installSizeArchive   += 32768; # take into account install.js
   $installSizeArchive    = int($size / 1024);
   $installSizeArchive   += 1;
   return($installSizeArchive);
@@ -193,7 +195,7 @@ sub OutputInstallSizeSystem()
       {
         # calculate the size of component installed using ds32.exe in Kbytes
         print "   calculating size for $inPath\\$_";
-        $installSizeSystem += `ds32.exe /L0 /A /S /C 32768 $inPath\\$_`;
+        $installSizeSystem += `ds32.exe /D /L0 /A /S /C 32768 $inPath\\$_`;
       }
     }
   }
diff --git a/xpinstall/packager/windows/makejs.pl b/xpinstall/packager/windows/makejs.pl
index 746937936b43..0364510978a3 100644
--- a/xpinstall/packager/windows/makejs.pl
+++ b/xpinstall/packager/windows/makejs.pl
@@ -114,7 +114,7 @@ sub GetSpaceRequired()
   my($spaceRequired);
 
   print "   calulating size for $inPath\n";
-  $spaceRequired    = `ds32.exe /L0 /A /S /C 32768 $inPath`;
+  $spaceRequired    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
   $spaceRequired    = int($spaceRequired / 1024);
   $spaceRequired   += 1;
   return($spaceRequired);