Changeset 3258

Timestamp:

06/22/08 20:47:30 (5 months ago)

Author:

xuesheng

Message:

Updated to use the new --shutdown command-line option when
called by the installer to monitor an SQL database upgrade

Files:

• branches/b0_22_2/windows/msgcapture.nsi (modified) (7 diffs)

branches/b0_22_2/windows/msgcapture.nsi

@@ -93 +93 @@
-# (this is the default behaviour).
-#
-
-
-
+
+
+
+
-#
-# Uppercase or lowercase can be used for the command-line switch.
@@ -118 +119 @@
-  ;--------------------------------------------------------------------------
-
-8
+9
-
-  !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
-
-  ;--------------------------------------------------------------------------
@@ -173 +167 @@
-  VIAddVersionKey "CompanyName"             "The POPFile Project"
-  VIAddVersionKey "LegalTrademarks"         "POPFile is a registered trademark of John Graham-Cumming"
- 
+
-  VIAddVersionKey "FileDescription"         "PFI Message Capture Utility (0-99 sec timeout)"
-  VIAddVersionKey "FileVersion"             "${C_VERSION}"
@@ -352 +346 @@
-installer_mode:
-  StrCpy $G_MODE_FLAG "PFI"
-  StrCpy ${L_TEMP} ${C_INSTALLER_TIMEOUT}
-  Goto exit
-
-default:
@@ -402 +394 @@
-  !define L_TEMP          $R6
-  !define L_TRAYICON      $R5   ; system tray icon enabled ("i" ) or disabled ("") flag
-0.23.0
+2.x
-                                ; so we use the --verbose option to turn them back on
-
@@ -460 +452 @@
-  DetailPrint "POPFILE_USER = ${L_PFI_USER}"
-
-  ; Starting with the 0.23.0 release, POPFile no longer displays startup messages
-  ; so we use the 'verbose' option to turn them on. Earlier POPFile releases do not
-  ; recognize this option and will not run if it is used, so we use the Database.pm
-  ; 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.
@@ -471 +458 @@
-  ; these are the only indication that POPFile is still working.
-  ;
-
-
-
+
+
+
+
-  ;
-
-
-
+
+
+
+
-
-  StrCpy ${L_OPTIONS} ""
-look_for_ex
+check_mod
-  StrCpy ${L_OPTIONS} "--verbose"
+
+check_mode:
-  StrCmp $G_MODE_FLAG "" look_for_exe
-