Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing bug 194115 - self-extracting installer no longer looks for .xpi files in cwd. r=sgehani, rs=jag, a=sspitzer

Browse Source
This commit is contained in:
ssu%netscape.com 2003-04-30 03:11:26 +00:00
parent 144ad77450
commit 2ef4a2fee4
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpinstall/wizard/windows/nsinstall/nsinstall.cpp
View File

@ -893,6 +893,7 @@ RunInstaller()
char szText[256];
char szTempPath[MAX_BUF];
char szTmp[MAX_PATH];
char xpiDir[MAX_PATH];
char szFilename[MAX_BUF];
char szBuf[MAX_BUF];
@ -921,9 +922,16 @@ RunInstaller()
else
{
lstrcpy(szCmdLine, szSetupFile);
GetModuleFileName(NULL, szBuf, sizeof(szBuf));
ParsePath(szBuf, szFilename, sizeof(szFilename), PP_FILENAME_ONLY);
GetModuleFileName(NULL, szFilename, sizeof(szFilename));
ParsePath(szFilename, xpiDir, sizeof(xpiDir), PP_PATH_ONLY);
AppendBackSlash(xpiDir, sizeof(xpiDir));
lstrcat(xpiDir, "xpi");
if(FileExists(xpiDir))
{
GetShortPathName(xpiDir, szBuf, sizeof(szBuf));
lstrcat(szCmdLine, " -a ");
lstrcat(szCmdLine, szBuf);
}
lstrcat(szCmdLine, " -n ");
lstrcat(szCmdLine, szFilename);
}

14
xpinstall/wizard/windows/setup/dialogs.c
View File

@ -2955,14 +2955,15 @@ void CommitInstall(void)
* appropriate Windows registry keys */
SetTurboArgs();
if(gbDownloadTriggered || gbPreviousUnfinishedDownload)
SetSetupState(SETUP_STATE_UNPACK_XPCOM);
/* POST_DOWNLOAD process file manipulation functions */
ProcessFileOpsForAll(T_POST_DOWNLOAD);
/* PRE_XPCOM process file manipulation functions */
ProcessFileOpsForAll(T_PRE_XPCOM);
/* save the installer files in the local machine */
if(diAdditionalOptions.bSaveInstaller)
SaveInstallerFiles();
if(CheckInstances())
{
bSDUserCanceled = TRUE;
@ -2972,6 +2973,9 @@ void CommitInstall(void)
return;
}
if(gbDownloadTriggered || gbPreviousUnfinishedDownload)
SetSetupState(SETUP_STATE_UNPACK_XPCOM);
if(ProcessXpinstallEngine() != WIZ_OK)
{
bSDUserCanceled = TRUE;
@ -2989,10 +2993,6 @@ void CommitInstall(void)
/* PRE_SMARTUPDATE process file manipulation functions */
ProcessFileOpsForAll(T_PRE_SMARTUPDATE);
/* save the installer files in the local machine */
if(diAdditionalOptions.bSaveInstaller)
SaveInstallerFiles();
lstrcat(szDestPath, "uninstall\\");
CreateDirectoriesAll(szDestPath, ADD_TO_UNINSTALL_LOG);
hrErr = SmartUpdateJars();

44
xpinstall/wizard/windows/setup/extra.c
View File

@ -5462,7 +5462,7 @@ void PrintUsage(void)
*/
if(sgProduct.szParentProcessFilename && *sgProduct.szParentProcessFilename != '\0')
lstrcpy(szProcessFilename, sgProduct.szParentProcessFilename);
ParsePath(sgProduct.szParentProcessFilename, szProcessFilename, sizeof(szProcessFilename), FALSE, PP_FILENAME_ONLY);
else
{
GetModuleFileName(NULL, szBuf, sizeof(szBuf));
@ -8216,30 +8216,27 @@ void SaveInstallerFiles()
{
int i;
char szBuf[MAX_BUF];
char szSource[MAX_BUF];
char szDestination[MAX_BUF];
char destInstallDir[MAX_BUF];
char destInstallXpiDir[MAX_BUF];
char szMFN[MAX_BUF];
char szArchivePath[MAX_BUF];
DWORD dwIndex0;
siC *siCObject = NULL;
GetSaveInstallerPath(szDestination, sizeof(szDestination));
AppendBackSlash(szDestination, sizeof(szDestination));
/* copy all files from the ns_temp dir to the install dir */
CreateDirectoriesAll(szDestination, ADD_TO_UNINSTALL_LOG);
GetSaveInstallerPath(destInstallDir, sizeof(destInstallDir));
AppendBackSlash(destInstallDir, sizeof(destInstallDir));
CreateDirectoriesAll(destInstallDir, ADD_TO_UNINSTALL_LOG);
/* copy the self extracting file that spawned setup.exe, if one exists */
if((*sgProduct.szAlternateArchiveSearchPath != '\0') && (*sgProduct.szParentProcessFilename != '\0'))
{
lstrcpy(szSource, szSetupDir);
AppendBackSlash(szSource, sizeof(szSource));
lstrcat(szSource, "*.*");
FileCopy(sgProduct.szParentProcessFilename, destInstallDir, FALSE, FALSE);
lstrcpy(szSource, sgProduct.szAlternateArchiveSearchPath);
AppendBackSlash(szSource, sizeof(szSource));
lstrcat(szSource, sgProduct.szParentProcessFilename);
FileCopy(szSource, szDestination, FALSE, FALSE);
/* The dir for xpi files is .\xpi because the self-extracting
* .exe file will automatically look for the .xpi files in a xpi subdir
* off of the current working dir. */
_snprintf(destInstallXpiDir, sizeof(destInstallXpiDir), "%sxpi\\", destInstallDir);
CreateDirectoriesAll(destInstallXpiDir, ADD_TO_UNINSTALL_LOG);
}
else
{
@ -8252,7 +8249,7 @@ void SaveInstallerFiles()
lstrcpy(szBuf, szSetupDir);
AppendBackSlash(szBuf, sizeof(szBuf));
lstrcat(szBuf, szMFN);
FileCopy(szBuf, szDestination, FALSE, FALSE);
FileCopy(szBuf, destInstallDir, FALSE, FALSE);
/* now copy the rest of the setup files */
i = 0;
@ -8264,10 +8261,21 @@ void SaveInstallerFiles()
lstrcpy(szBuf, szSetupDir);
AppendBackSlash(szBuf, sizeof(szBuf));
lstrcat(szBuf, SetupFileList[i]);
FileCopy(szBuf, szDestination, FALSE, FALSE);
FileCopy(szBuf, destInstallDir, FALSE, FALSE);
++i;
}
/* copy the license file */
if(*diLicense.szLicenseFilename != '\0')
FileCopy(diLicense.szLicenseFilename, destInstallDir, FALSE, FALSE);
/* copy the readme file */
if(*diSetupType.szReadmeFilename != '\0')
FileCopy(diLicense.szLicenseFilename, destInstallDir, FALSE, FALSE);
/* The dir for xpi files is just "." as opposed to ".\xpi"
* because the setup.exe (not the self-extracting .exe) will look for the
* .xpi files in the cwd. */
MozCopyStr(destInstallDir, destInstallXpiDir, sizeof(destInstallXpiDir));
}
dwIndex0 = 0;
@ -8280,7 +8288,7 @@ void SaveInstallerFiles()
lstrcpy(szBuf, szArchivePath);
AppendBackSlash(szBuf, sizeof(szBuf));
lstrcat(szBuf, siCObject->szArchiveName);
FileCopy(szBuf, szDestination, FALSE, FALSE);
FileCopy(szBuf, destInstallXpiDir, FALSE, FALSE);
}
++dwIndex0;