Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Unix makefiles (that really do not do anything)

Browse Source 
Added Arguments and Jarfile variables to the Install object which
are now being reflected into js.
Fixed how ExtractJarFile in Install was working
Hooked up to libjar.

** These changes are not part of the Tinderbox builds **


git-svn-id: svn://10.0.0.236/trunk@22605 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
1999-03-02 20:25:42 +00:00
parent ccb66a01d5
commit ca9ff84fe2
22 changed files with 434 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
mozilla/xpinstall/src/nsInstallFile.cpp
View File

@@ -31,8 +31,9 @@
#include "nsInstallFile.h"
#include "nsInstall.h"
#include "nsInstallVersion.h"
#include "nsIDOMInstallFolder.h"
#include "nsIDOMInstallVersion.h"
#include "nsInstallErrorMessages.h"
@@ -80,16 +81,25 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
return;
}
mVersionRegistryName = new nsString(inVRName);
mJarLocation = new nsString(inJarLocation);
mVersionInfo = inVInfo; /* XXX: Who owns and who free's this object. Is it nsSoftwareUpdate?? */
mReplaceFile = DoesFileExist();
mForceInstall = forceInstall;
folderSpec->IsJavaCapable(&mJavaInstall);
mVersionRegistryName = new nsString(inVRName);
mJarLocation = new nsString(inJarLocation);
mVersionInfo = new nsInstallVersion();
//FIX need to delete char* created by .ToNewCString().
nsString tempString;
inVInfo->ToString(tempString);
mVersionInfo->Init(tempString.ToNewCString());
mFinalFile = new nsString();
folderSpec->MakeFullPath(inPartialPath, *mFinalFile);
mReplaceFile = DoesFileExist();
nsString regPackageName;
@@ -122,12 +132,20 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
nsInstallFile::~nsInstallFile()
{
delete mVersionRegistryName;
delete mJarLocation;
if (mTempFile)
delete mTempFile;
if (mFinalFile)
delete mFinalFile;
if (mVersionRegistryName)
delete mVersionRegistryName;
if (mJarLocation)
delete mJarLocation;
if (mTempFile)
delete mTempFile;
if (mFinalFile)
delete mFinalFile;
if (mVersionInfo)
delete mVersionInfo;
}
/* Prepare
@@ -138,10 +156,7 @@ PRInt32 nsInstallFile::Prepare()
if (mInstall == NULL || mFinalFile == NULL || mJarLocation == NULL)
return nsInstall::INVALID_ARGUMENTS;
PRInt32 err;
mInstall->ExtractFileFromJar(*mJarLocation, *mFinalFile, *mTempFile, &err);
return err;
return mInstall->ExtractFileFromJar(*mJarLocation, *mFinalFile, &mTempFile);
}
/* Complete
@@ -165,22 +180,9 @@ PRInt32 nsInstallFile::Complete()
err = NativeComplete();
char *vr_name = mVersionRegistryName->ToNewCString();
char *final_file = mFinalFile->ToNewCString();
// Add java archives to the classpath. Don't add if we're
// replacing an existing file -- it'll already be there.
if ( mJavaInstall && !mReplaceFile )
{
PRBool found_zip = endsWith(mFinalFile, ".zip");
PRBool found_jar = endsWith(mFinalFile, ".jar");;
if (found_zip || found_jar)
{
AddToClasspath( mFinalFile );
}
}
char *vr_name = mVersionRegistryName->ToNewCString();
nsString regPackageName;
mInstall->GetRegPackageName(regPackageName);
@@ -421,17 +423,6 @@ end:
}
void nsInstallFile::AddToClasspath(nsString* file)
{
if ( file != NULL ) {
char *final_file = file->ToNewCString();
// FIX JVM_AddToClassPath(final_file);
delete final_file;
}
}
/* Finds out if the file exists
*/
PRBool nsInstallFile::DoesFileExist()