[popfile-commit] windows adduser-Version.nsh, 1.6.2.9, 1.6.2.10 adduser.nsi, 1.59.4.10, 1.59.4.11

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

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

Modified Files:
      Tag: b0_22_2
	adduser-Version.nsh adduser.nsi 
Log Message:
For the 0.22.5 release POPFile is switching from an old version of
DBD::SQLite to the latest version of DBD::SQLite 2. When upgrading
an existing installation which is configured to use DBD::SQLite
change the configuration to make it use DBD::SQLite2 instead.

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -d -r1.6.2.9 -r1.6.2.10
*** adduser-Version.nsh	5 Dec 2006 20:33:50 -0000	1.6.2.9
--- adduser-Version.nsh	28 Jan 2007 21:16:45 -0000	1.6.2.10
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.3.4"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.3.5"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.10
retrieving revision 1.59.4.11
diff -C2 -d -r1.59.4.10 -r1.59.4.11
*** adduser.nsi	5 Dec 2006 20:33:50 -0000	1.59.4.10
--- adduser.nsi	28 Jan 2007 21:16:45 -0000	1.59.4.11
***************
*** 8,12 ****
  #                 be done using this wizard.
  #
! # Copyright (c) 2004-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 8,12 ----
  #                 be done using this wizard.
  #
! # Copyright (c) 2004-2007 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 2212,2215 ****
--- 2212,2220 ----
  # skin will not be shown in the Configuration page of the UI (the UI will show the first entry
  # in the list ("blue") instead of the skin currently in use).
+ #
+ # For the 0.22.5 release POPFile switched from using an old version of the DBD::SQLite package
+ # to the newer DBD::SQLite2 package. This change lets POPFile use the most recent SQLite 2.x
+ # libraries (POPFile cannot use SQLite3.x libraries yet). If upgrading an installation that
+ # currently uses DBD::SQLite then change the configuration in popfile.cfg to use DBD::SQLite2.
  #--------------------------------------------------------------------------
  
***************
*** 2282,2285 ****
--- 2287,2291 ----
    StrCpy ${L_CMPRE} ${L_LNE} 16
    StrCmp ${L_CMPRE} "windows_console " got_console
+   StrCmp ${L_CMPRE} "bayes_dbconnect " got_dbconnect
  
    ; do not transfer any UI language settings to the copy of popfile.cfg
***************
*** 2314,2317 ****
--- 2320,2333 ----
    Goto loop
  
+ got_dbconnect:
+   Push ${L_LNE}
+   Push "dbi:SQLite:"
+   Call PFI_StrStr
+   Pop ${L_CMPRE}
+   StrCmp ${L_CMPRE} "" copy_lne
+   StrCpy ${L_CMPRE} ${L_CMPRE} "" 11
+   StrCpy ${L_LNE} "bayes_dbconnect dbi:SQLite2:${L_CMPRE}"
+   Goto copy_lne
+ 
  got_lang_new:
    StrCpy ${L_LANG_NEW} ${L_LNE} "" 14