Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv11340
Modified Files:
installer.nsi
Added Files:
CBP.nsh
Log Message:
Merged patch that allows the installer to create buckets
--- NEW FILE: CBP.nsh ---
#----------------------------------------------------------------------------------------------
#
# CBP.nsh --- This file is used by 'installer.nsi', the NSIS script used to create the
# Windows installer for POPFile. The CBP package allows the user to select several
# buckets for use with a "clean" install of POPFile. Three built-in default values
# can be overridden by creating suitable "!define" statements in 'installer.nsi'.
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#----------------------------------------------------------------------------------------------
# This version of 'CBP.nsh' was tested using NSIS 2.0b4 (CVS)
#//////////////////////////////////////////////////////////////////////////////////////////////
#
# External interface - starts here
#
#//////////////////////////////////////////////////////////////////////////////////////////////
[...1651 lines suppressed...]
!undef CBP_C_CREATE_BN
!undef CBP_C_FULL_COMBO_LIST
!undef CBP_C_MIN_COMBO_LIST
!undef CBP_C_MESSAGE
!undef CBP_C_FIRST_BN_CBOX
!undef CBP_C_FIRST_BN_CBOX_MINUS_ONE
!undef CBP_C_FIRST_BN_TEXT
!undef CBP_C_LAST_BN_TEXT_PLUS_ONE
!undef CBP_C_MAX_BNCOUNT
!undef CBP_C_MAX_BN_TEXT_PLUS_ONE
!undef CBP_MAX_BN_CBOX_PLUS_ONE
#==============================================================================================
# End of CBP.nsh
#==============================================================================================
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** installer.nsi 14 Mar 2003 22:35:17 -0000 1.34
--- installer.nsi 15 Apr 2003 21:31:18 -0000 1.35
***************
*** 6,9 ****
--- 6,33 ----
!define MUI_VERSION "0.18.1"
!include "MUI.nsh"
+
+ #----------------------------------------------------------------------------------------
+ # CBP Configuration Data (leave lines commented-out if defaults are satisfactory)
+ #----------------------------------------------------------------------------------------
+ # ; Maximum number of buckets handled (in range 2 to 8)
+ #
+ # !define CBP_MAX_BUCKETS 8
+ #
+ # ; Default bucket selection (use "" if no buckets are to be pre-selected)
+ #
+ # !define CBP_DEFAULT_LIST "in-box|junk|personal|work"
+ #
+ # ; List of suggestions for bucket names (use "" if no suggestions are required)
+ #
+ # !define CBP_SUGGESTION_LIST \
+ # "admin|business|computers|family|financial|general|hobby|in-box|junk|list-admin|\
+ # miscellaneous|not_spam|other|personal|recreation|school|security|shopping|spam|\
+ # travel|work"
+ #----------------------------------------------------------------------------------------
+ # Make the CBP package available
+ #----------------------------------------------------------------------------------------
+
+ !include CBP.nsh
+
;--------------------------------
;Configuration
***************
*** 53,59 ****
!insertmacro MUI_PAGECOMMAND_COMPONENTS
!insertmacro MUI_PAGECOMMAND_DIRECTORY
! Page custom SetOptionsPage ": Options"
!insertmacro MUI_PAGECOMMAND_INSTFILES
! Page custom SetOutlookOrOutlookExpressPage ": Configure Outlook Express"
!insertmacro MUI_PAGECOMMAND_FINISH
--- 77,84 ----
!insertmacro MUI_PAGECOMMAND_COMPONENTS
!insertmacro MUI_PAGECOMMAND_DIRECTORY
! Page custom SetOptionsPage "" ": Options"
!insertmacro MUI_PAGECOMMAND_INSTFILES
! !insertmacro CBP_PAGECOMMAND_SELECTBUCKETS ": Create POPFile Buckets"
! Page custom SetOutlookOrOutlookExpressPage "" ": Configure Outlook Express"
!insertmacro MUI_PAGECOMMAND_FINISH
|
