fixing bug . installer build scripts are now coded to install msvcrt and msvcirt.dll files. not part of tinderbox builds. affects only windows platforms

This commit is contained in:
ssu%netscape.com 2000-05-08 04:11:30 +00:00
parent c134a3fd2b
commit 0248e6aa1b
2 changed files with 67 additions and 0 deletions
xpinstall/packager/windows

@ -60,6 +60,21 @@ if(!(-e "$inStagePath\\$inComponentName"))
die "invalid path: $inStagePath\\$inComponentName\n";
}
if($inComponentName =~ /xpcom/i)
{
# copy msvcrt.dll to xpcom dir
if(-e "$ENV{MOZ_SRC}\\redist\\microsoft\\system\\msvcrt.dll")
{
system("copy $ENV{MOZ_SRC}\\redist\\microsoft\\system\\msvcrt.dll $inStagePath\\$inComponentName");
}
# copy msvcirt.dll to xpcom dir
if(-e "$ENV{MOZ_SRC}\\redist\\microsoft\\system\\msvcirt.dll")
{
system("copy $ENV{MOZ_SRC}\\redist\\microsoft\\system\\msvcirt.dll $inStagePath\\$inComponentName");
}
}
# check for existance of .js script
if(!(-e "$inComponentName.js"))
{

@ -51,8 +51,11 @@ var szUninstall;
var fUninstall;
var fCommunicator;
var fWindowsSystem;
var fileTemp;
var fileComponentReg;
var fileComponentRegStr;
var fileMsvcrt;
var fileMsvcirt;
srDest = $SpaceRequired$:bin;
err = startInstall("Mozilla XPCom", "XPCom", "$Version$");
@ -83,6 +86,55 @@ if(verifyDiskSpace(fCommunicator, srDest) == true)
true); // Force Flag
logComment("addDirectory() of Program returned: " + err);
if(!checkError(err))
{
// install msvcrt.dll *only* if it does not exist
// we don't care if addFile() fails (if the file does not exist in the archive)
// bacause it will still install
fileTemp = fWindowsSystem + "msvcrt.dll";
fileMsvcrt = getFolder("file:///", fileTemp);
rv = File.exists(fileMsvcrt);
logComment("fileExists() returned: " + rv);
if(rv == false)
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared",
"$Version$",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fCommunicator
true); // Force Flag
logComment("addFile() of msvcrt.dll returned: " + err);
}
else
{
logComment("File found: " + fileMsvcrt);
}
// install msvcirt.dll *only* if it does not exist
// we don't care if addFile() fails (if the file does not exist in the archive)
// bacause it will still install
fileTemp = fWindowsSystem + "msvcirt.dll";
fileMsvcirt = getFolder("file:///", fileTemp);
rv = File.exists(fileMsvcirt);
logComment("fileExists() returned: " + rv);
if(rv == false)
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared",
"$Version$",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fCommunicator
true); // Force Flag
logComment("addFile() of msvcirt.dll returned: " + err);
}
else
{
logComment("File found: " + fileMsvcirt);
}
}
// check return value
if(!checkError(err))
{