[popfile-commit] windows CBP.nsh,1.2,1.3 Makefile,1.8,1.9 installer.nsi,1.39,1.40

[<jgr...@us...>]

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

Modified Files:
	CBP.nsh Makefile installer.nsi 
Log Message:
Minor updates to Makefile, change in-box to inbox, junk to spam and make deletion kill off the corpus

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CBP.nsh	2 May 2003 19:25:11 -0000	1.2
--- CBP.nsh	5 May 2003 20:40:10 -0000	1.3
***************
*** 366,370 ****
        !define CBP_C_DEFAULT_BUCKETS `${CBP_DEFAULT_LIST}`
    !else
!       !define CBP_C_DEFAULT_BUCKETS "in-box|junk|personal|work"
    !endif
  
--- 366,370 ----
        !define CBP_C_DEFAULT_BUCKETS `${CBP_DEFAULT_LIST}`
    !else
!       !define CBP_C_DEFAULT_BUCKETS "inbox|spam|personal|work"
    !endif
  
***************
*** 377,381 ****
    !else
        !define CBP_C_SUGGESTED_BUCKETS \
!       "admin|business|computers|family|financial|general|hobby|in-box|junk|list-admin|\
        miscellaneous|not_spam|other|personal|recreation|school|security|shopping|spam|\
        travel|work"
--- 377,381 ----
    !else
        !define CBP_C_SUGGESTED_BUCKETS \
!       "admin|business|computers|family|financial|general|hobby|inbox|junk|list-admin|\
        miscellaneous|not_spam|other|personal|recreation|school|security|shopping|spam|\
        travel|work"

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/windows/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	19 Feb 2003 16:20:33 -0000	1.8
--- Makefile	5 May 2003 20:40:10 -0000	1.9
***************
*** 1,12 ****
  .PHONY: all build
  
! all: build
  
! build: setup.exe
  
  setup.exe: ../engine/*.pl ../engine/Classifier/*.pm ../engine/skins/*.css ../engine/skins/*.gif
! setup.exe: installer.nsi ioA.ini ioB.ini
  	@../NSIS/makensis.exe /V4 $<
- 
- 
- 	
\ No newline at end of file
--- 1,14 ----
  .PHONY: all build
  
! POPFILE_WINDOWS_ZIP := popfile-$(POPFILE_VERSION)-windows.zip
! BUILD_ZIP=../engine/wzzip -P $(POPFILE_WINDOWS_ZIP) -a $^
  
! all: build
! build: $(POPFILE_WINDOWS_ZIP)
! $(POPFILE_WINDOWS_ZIP): setup.exe
! 	rm -f $@
! 	$(BUILD_ZIP)
  
  setup.exe: ../engine/*.pl ../engine/Classifier/*.pm ../engine/skins/*.css ../engine/skins/*.gif
! setup.exe: installer.nsi ioA.ini ioB.ini CBP.nsh
  	@../NSIS/makensis.exe /V4 $<

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** installer.nsi	4 May 2003 20:44:23 -0000	1.39
--- installer.nsi	5 May 2003 20:40:10 -0000	1.40
***************
*** 10,19 ****
  #--------------------------------------------------------------------------
  
! ; Modified to work with NSIS 2.0b4 (CVS) or later
  
  #--------------------------------------------------------------------------
  
    !define MUI_PRODUCT "POPFile"
!   !define MUI_VERSION "0.19.0 (CVS)"
    !include "MUI.nsh"
  
--- 10,19 ----
  #--------------------------------------------------------------------------
  
! ; Modified to work with NSIS 2.0b3 (CVS) or later
  
  #--------------------------------------------------------------------------
  
    !define MUI_PRODUCT "POPFile"
!   !define MUI_VERSION "0.19.0 RC1"
    !include "MUI.nsh"
  
***************
*** 199,203 ****
     
    File "..\engine\license"
!   File "..\engine\v0.18.1.change"
    File "..\engine\*.pl"
    File "..\engine\pix.gif"
--- 199,203 ----
     
    File "..\engine\license"
!   File "..\engine\v0.19.0.change"
    File "..\engine\*.pl"
    File "..\engine\pix.gif"
***************
*** 1074,1077 ****
--- 1074,1079 ----
    Delete $INSTDIR\languages\*.msg
    RMDir $INSTDIR\languages
+   RMDir /r $INSTDIR\corpus
+   Delete $INSTDIR\stopwords
  
    Delete $INSTDIR\MIME\*.*