[popfile-commit] windows msgcapture.nsi,1.7.4.2,1.7.4.3

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1617

Modified Files:
      Tag: b0_22_2
	msgcapture.nsi 
Log Message:
Increase the pre-0.23.0 release "installer" timeout from 15 seconds
to 30 seconds (to cope better with very large database conversions)

Change GPL license to remove the option for the person using POPFile
to license it under any version of the GPL other than v2

Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.7.4.2
retrieving revision 1.7.4.3
diff -C2 -d -r1.7.4.2 -r1.7.4.3
*** msgcapture.nsi	19 Dec 2005 11:45:36 -0000	1.7.4.2
--- msgcapture.nsi	6 Feb 2006 16:55:52 -0000	1.7.4.3
***************
*** 7,16 ****
  #                    used by earlier installers it caused confusion amongst some users).
  #
! # Copyright (c) 2004-2005  John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
--- 7,16 ----
  #                    used by earlier installers it caused confusion amongst some users).
  #
! # Copyright (c) 2004-2006  John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms of version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
***************
*** 70,73 ****
--- 70,78 ----
  #--------------------------------------------------------------------------
  
+   ; 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')
***************
*** 110,120 ****
    ;--------------------------------------------------------------------------
  
!   !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
  
    ;--------------------------------------------------------------------------
--- 115,128 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION             "0.0.64"
  
    !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
  
    ;--------------------------------------------------------------------------
***************
*** 153,157 ****
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2005  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "PFI Message Capture Utility (0-99 sec timeout)"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"
--- 161,165 ----
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "PFI Message Capture Utility (0-99 sec timeout)"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"
***************
*** 452,458 ****
--- 460,489 ----
    ; 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: