fixing bug #19034 - Install.log needs to be created in XPCOM's notion of cwd.

This bug affects several things.  what I'm checking in is a fix to the windows
wizard installer to:
1) pass new parameter to xpi_init() - which Samir checked in tonight.
2) update windows wizard installer to know of the new install.log location.
3) changed the installer to create/update the log filename passed to xpi_init() (install_wizard.log).

This fix affects the installer (setup.exe) and the uninstaller (uninstall.exe).
This bug is marked as nsbeta2+ and was already verified by QA, but they were not aware
of the affects to the native windows installer (which is part of this bug).

The windows installer will be dead in the morning without this checkin.

r=sgehani
affects windows platforms only
This commit is contained in:
ssu%netscape.com 2000-07-11 07:00:21 +00:00
Родитель 4157de5421
Коммит 6f0aa022c9
6 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -681,8 +681,11 @@ void UpdateInstallLog(LPSTR szKey, LPSTR szDir)
char szBuf[MAX_BUF];
char szFileInstallLog[MAX_BUF];
lstrcpy(szFileInstallLog, szSetupDir);
lstrcpy(szFileInstallLog, sgProduct.szPath);
AppendBackSlash(szFileInstallLog, sizeof(szFileInstallLog));
lstrcat(szFileInstallLog, sgProduct.szSubPath);
AppendBackSlash(szFileInstallLog, sizeof(szFileInstallLog));
CreateDirectoriesAll(szFileInstallLog, FALSE);
lstrcat(szFileInstallLog, FILE_INSTALL_LOG);
if((fInstallLog = fopen(szFileInstallLog, "a+t")) != NULL)

Просмотреть файл

@ -64,7 +64,7 @@ typedef int PRInt32;
#define FILE_IDI_GETREDIRECT "getredirect.idi"
#define FILE_INI_REDIRECT "redirect.ini"
#define WIZ_TEMP_DIR "ns_temp"
#define FILE_INSTALL_LOG "install.log"
#define FILE_INSTALL_LOG "install_wizard.log"
#define FILE_ALL_JS "all.js"
/* UG: Upgrade */

Просмотреть файл

@ -175,7 +175,7 @@ HRESULT SmartUpdateJars()
AppendBackSlash(szBuf, sizeof(szBuf));
lstrcat(szBuf, sgProduct.szSubPath);
}
hrResult = pfnXpiInit(szBuf, cbXPIProgress);
hrResult = pfnXpiInit(szBuf, FILE_INSTALL_LOG, cbXPIProgress);
ShowMessage(szMsgSmartUpdateStart, FALSE);
InitProgressDlg();

Просмотреть файл

@ -29,7 +29,7 @@
#define BAR_SPACING 2
#define BAR_WIDTH 6
typedef HRESULT (_cdecl *XpiInit)(const char *, pfnXPIProgress);
typedef HRESULT (_cdecl *XpiInit)(const char *, const char *aLogName, pfnXPIProgress);
typedef HRESULT (_cdecl *XpiInstall)(const char *, const char *, long);
typedef void (_cdecl *XpiExit)(void);

Просмотреть файл

@ -86,7 +86,8 @@ PR_EXTERN(nsresult) XPI_Init(
#else
const char* aProgramDir,
#endif
pfnXPIProgress progressCB );
const char* aLogName,
pfnXPIProgress progressCB);
/** XPI_Install
*

Просмотреть файл

@ -50,7 +50,7 @@ typedef int PRInt32;
#define CLASS_NAME "Uninstall"
#define FILE_INI_UNINSTALL "uninstall.ini"
#define FILE_LOG_INSTALL "install.log"
#define FILE_LOG_INSTALL "install_wizard.log"
#define WIZ_TEMP_DIR "ns_temp"
/* WTD: What To Do */