[popfile-commit] windows/add-ons updateimap.nsi,1.3,1.4

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

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

Modified Files:
	updateimap.nsi 
Log Message:
If updating a pre-0.23.0 installation use the new 0.22.x-compatible
version of IMAP.pm which was made available earlier today.

Index: updateimap.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/updateimap.nsi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** updateimap.nsi	21 Dec 2005 20:35:25 -0000	1.3
--- updateimap.nsi	10 Feb 2006 23:51:56 -0000	1.4
***************
*** 7,11 ****
  #                    is still 'experimental' so it is not shipped with the 0.22.0 release).
  #
! # Copyright (c) 2004-2005 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 7,11 ----
  #                    is still 'experimental' so it is not shipped with the 0.22.0 release).
  #
! # Copyright (c) 2004-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 121,125 ****
    Name                   "POPFile IMAP Updater"
  
!   !define C_PFI_VERSION  "0.0.7"
  
    ; Mention the wizard's version number in the window title
--- 121,125 ----
    Name                   "POPFile IMAP Updater"
  
!   !define C_PFI_VERSION  "0.0.8"
  
    ; Mention the wizard's version number in the window title
***************
*** 145,148 ****
--- 145,157 ----
    !define C_CVS_IMAP_DL_URL   "http://cvs.sourceforge.net/viewcvs.py/*checkout*/popfile/engine/Services/IMAP.pm?rev=$G_REVISION"
  
+   ;--------------------------------------------------------------------------
+   ; POPFile's module format was changed for the POPFile 0.23.0 release so any
+   ; modules intended for 0.23.0 (or later) are no longer compatible with the
+   ; earlier releases. Therefore if this utility is used to add or update the
+   ; IMAP module in a pre-0.23.0 installation it must ensure it downloads the
+   ; most recent _compatible_ module instead of simply the most recent module.
+   ;--------------------------------------------------------------------------
+ 
+   !define C_PRE_23_COMPATIBLE_VERSION     "1.9.4.2"
  
  #--------------------------------------------------------------------------
***************
*** 206,210 ****
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2005  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Updates the IMAP module for POPFile 0.22.x"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
--- 215,219 ----
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Updates the IMAP module for POPFile 0.22.x"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
***************
*** 624,628 ****
  look_for_suitable_version:
    IfFileExists "$G_ROOTDIR\POPFile\Database.pm" look_for_most_recent_version
!   StrCpy $G_REVISION "1.9"
    DetailPrint "Pre-0.23.0 installation found. Get most recent 0.22-compatible file (IMAP.pm v$G_REVISION)"
    Goto get_imap_module
--- 633,637 ----
  look_for_suitable_version:
    IfFileExists "$G_ROOTDIR\POPFile\Database.pm" look_for_most_recent_version
!   StrCpy $G_REVISION "${C_PRE_23_COMPATIBLE_VERSION}"
    DetailPrint "Pre-0.23.0 installation found. Get most recent 0.22-compatible file (IMAP.pm v$G_REVISION)"
    Goto get_imap_module