[popfile-commit] windows installer.nsi,1.75,1.76

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv28733

Modified Files:
	installer.nsi 
Log Message:
Made it easier for users to keep the 'stopwords' file up to date when upgrading POPFile.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** installer.nsi	24 Jun 2003 12:42:23 -0000	1.75
--- installer.nsi	24 Jun 2003 19:52:49 -0000	1.76
***************
*** 283,287 ****
    
    SetDetailsPrint textonly
!   DetailPrint "Checking for existing version of POPFile..."
    SetDetailsPrint listonly
  
--- 283,287 ----
    
    SetDetailsPrint textonly
!   DetailPrint "Checking if this is an upgrade installation..."
    SetDetailsPrint listonly
  
***************
*** 319,337 ****
    File "..\engine\otto.gif"
  
!   IfFileExists "$INSTDIR\stopwords" stopwords_found
    File "..\engine\stopwords"
!   Goto stopwords_done
! 
! stopwords_found:
!   IfFileExists "$INSTDIR\stopwords.default" 0 use_other_name
!   MessageBox MB_YESNO "Copy of default 'stopwords' already exists ('stopwords.default').$\r$\n\
!       $\r$\nOK to overwrite this file?$\r$\n$\r$\n\
!       Click 'Yes' to overwrite, click 'No' to skip updating this file" IDNO stopwords_done
!   SetFileAttributes "$INSTDIR\stopwords.default" NORMAL
! 
! use_other_name:
    File /oname=stopwords.default "..\engine\stopwords"
- 
- stopwords_done:
    FileOpen  ${CFG} $PLUGINSDIR\popfile.cfg a
    FileSeek  ${CFG} 0 END
--- 319,339 ----
    File "..\engine\otto.gif"
  
!   IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
!   MessageBox MB_YESNO "POPFile 'stopwords' file from previous installation found.$\r$\n$\r$\n\
!       OK to update this 'stopwords' file ?$\r$\n$\r$\n\
!       Click 'Yes' to update it (old file will be saved as 'stopwords.bak')$\r$\n$\r$\n\
!       Click 'No' to keep the old file (new file will saved as 'stopwords.default')" \
!       IDNO copy_default_stopwords
!   IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
!   SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
!   
! make_backup:
!   CopyFiles /SILENT /FILESONLY "$INSTDIR\stopwords" "$INSTDIR\stopwords.bak"
!   
! copy_stopwords:
    File "..\engine\stopwords"
!   
! copy_default_stopwords:
    File /oname=stopwords.default "..\engine\stopwords"
    FileOpen  ${CFG} $PLUGINSDIR\popfile.cfg a
    FileSeek  ${CFG} 0 END
***************
*** 348,355 ****
  
  make_cfg_backup:
!   CopyFiles $INSTDIR\popfile.cfg $INSTDIR\popfile.cfg.bak
  
  update_config:
!   CopyFiles $PLUGINSDIR\popfile.cfg $INSTDIR\
  
    SetOutPath $INSTDIR\Classifier
--- 350,357 ----
  
  make_cfg_backup:
!   CopyFiles /SILENT /FILESONLY $INSTDIR\popfile.cfg $INSTDIR\popfile.cfg.bak
  
  update_config:
!   CopyFiles /SILENT /FILESONLY $PLUGINSDIR\popfile.cfg $INSTDIR\
  
    SetOutPath $INSTDIR\Classifier
***************
*** 1797,1800 ****
--- 1799,1804 ----
    RMDir /r $INSTDIR\corpus
    Delete $INSTDIR\stopwords
+   Delete $INSTDIR\stopwords.bak
+   Delete $INSTDIR\stopwords.default
    RMDir /r $INSTDIR\messages