Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21893
Modified Files:
msgcapture.nsi
Log Message:
Updated to use POPFile's new '--shutdown' option when a database upgrade
is expected. Backwards compatibility still maintained.
(The "Add POPFile User" wizard needs to be changed now that the Message
Capture utility no longer leaves POPFile running after the upgrade)
Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** msgcapture.nsi 2 Mar 2005 20:01:32 -0000 1.11
--- msgcapture.nsi 24 Nov 2005 10:56:52 -0000 1.12
***************
*** 71,74 ****
--- 71,79 ----
#--------------------------------------------------------------------------
+ ; Although this utility was originally created for the 0.22.0 installer it is compatible
+ ; with POPFile 0.20.x and 0.21.x installations created by the installer, though in some
+ ; cases a small batch file may be required in order to define POPFILE_ROOT and POPFILE_USER
+ ; before running it (this utility assumes these two environment variables have been defined).
+
#--------------------------------------------------------------------------
# Optional run-time command-line switch (used by 'msgcapture.exe')
***************
*** 111,121 ****
;--------------------------------------------------------------------------
! !define C_VERSION "0.0.61"
!define C_OUTFILE "msgcapture.exe"
! ; The timeout used when the installer calls this utility to monitor the SQL database upgrade
! !define C_INSTALLER_TIMEOUT 15
;--------------------------------------------------------------------------
--- 116,129 ----
;--------------------------------------------------------------------------
! !define C_VERSION "0.0.62"
!define C_OUTFILE "msgcapture.exe"
! ; The timeout (in seconds) used when a pre-0.23.0 version of the installer calls
! ; this utility to monitor the SQL database upgrade. Note: 30 seconds may not be
! ; long enough to cope with the upgrade of very large databases (over 100 MB) on
! ; some systems.
! !define C_INSTALLER_TIMEOUT 30
;--------------------------------------------------------------------------
***************
*** 453,459 ****
--- 461,490 ----
; file as a simple POPFile version test (this file was first used in 0.23.0)
+ ; This utility is called by the "Add POPFile User" wizard (adduser.exe) with the option
+ ; '/TIMEOUT=PFI' when the installer detects that an existing SQL database is to be upgraded.
+ ; Database upgrades can take a very long time if the database is huge (over 30 minutes in
+ ; some cases). During the upgrade this utility is used to display the progress reports as
+ ; these are the only indication that POPFile is still working.
+ ;
+ ; Since POPFile cannot be used during the upgrade and the installer cannot easily monitor
+ ; the progress of the upgrade, a new POPFile command-line option was added for the 0.23.0
+ ; release.
+ ;
+ ; This new option (--shutdown) causes POPFile to shutdown after performing the upgrade so
+ ; when monitoring a SQL database upgrade we simply wait for POPFile to terminate (instead
+ ; of using a less than satisfactory 'one-size-fits-all' timeout).
+
StrCpy ${L_OPTIONS} ""
IfFileExists "${L_PFI_ROOT}\POPFile\Database.pm" 0 look_for_exe
StrCpy ${L_OPTIONS} "--verbose"
+ StrCmp $G_MODE_FLAG "" look_for_exe
+
+ ; The upgrading of an existing SQL database is to be monitored, so we tell POPFile to
+ ; shutdown after the upgrade and then wait for POPFile to exit (i.e. we don't use a timeout).
+ ; Since POPFile will shutdown afterwards, there is no point in using the system tray icon.
+
+ StrCpy ${L_OPTIONS} "${L_OPTIONS} --shutdown"
+ StrCpy $G_TIMEOUT "0"
+ StrCpy ${L_TRAYICON} ""
look_for_exe:
|
