Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv8960
Modified Files:
installer.nsi
Log Message:
Updated to work with latest version of NSIS MUI (v1.65). Removed redundant line from Uninstall section.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** installer.nsi 25 May 2003 00:36:22 -0000 1.52
--- installer.nsi 26 May 2003 15:18:46 -0000 1.53
***************
*** 10,14 ****
#--------------------------------------------------------------------------
! ; Modified to work with NSIS 2.0b4 (CVS) or later
#--------------------------------------------------------------------------
--- 10,18 ----
#--------------------------------------------------------------------------
! ; Modified to work with NSIS 2.0b4 (CVS) [ dated 25 May 2003 ] or later
!
! ; WARNING:
! ; This script requires "NSIS Modern User Interface" version 1.65 (or later)
! ; because it uses the new (simplified) page configuration system
#--------------------------------------------------------------------------
***************
*** 44,76 ****
#--------------------------------------------------------------------------
! # Installer Configuration
#--------------------------------------------------------------------------
! !define MUI_CUSTOMPAGECOMMANDS
!
! ; The "Special" bitmap appears on the "Welcome" and "Finish" pages,
! ; the "Header" bitmap appears on the other pages of the installer.
! !define MUI_SPECIALBITMAP "special.bmp"
! !define MUI_HEADERBITMAP "hdr-right.bmp"
! !define MUI_HEADERBITMAP_RIGHT
! !define MUI_WELCOMEPAGE
! !define MUI_LICENSEPAGE
; Select either "accept/do not accept" radio buttons or "accept" checkbox for the license page
! # !define MUI_LICENSEPAGE_RADIOBUTTONS
! !define MUI_LICENSEPAGE_CHECKBOX
!
! !define MUI_COMPONENTSPAGE
! !define MUI_DIRECTORYPAGE
! ; Use a "leave" function to look for 'popfile.cfg' in the directory selected for this install
- !define MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE CheckExistingConfig
-
!define MUI_ABORTWARNING
! !define MUI_FINISHPAGE
; The icon files for the installer and uninstaller must have the same structure. For example,
--- 48,101 ----
#--------------------------------------------------------------------------
! # Define the Page order for the installer (and the uninstaller)
#--------------------------------------------------------------------------
! ; Installer Pages
! !insertmacro MUI_PAGE_WELCOME
! !insertmacro MUI_PAGE_LICENSE
! !insertmacro MUI_PAGE_COMPONENTS
! !insertmacro MUI_PAGE_DIRECTORY
! Page custom SetOptionsPage "CheckPortOptions" ": Options"
! !insertmacro MUI_PAGE_INSTFILES
! !insertmacro CBP_PAGECOMMAND_SELECTBUCKETS ": Create POPFile Buckets"
! Page custom SetOutlookOrOutlookExpressPage "" ": Configure Outlook Express"
! !insertmacro MUI_PAGE_FINISH
!
! ; Uninstaller Pages
!
! !insertmacro MUI_UNPAGE_CONFIRM
! !insertmacro MUI_UNPAGE_INSTFILES
! #--------------------------------------------------------------------------
! # Configure the MUI pages
! #--------------------------------------------------------------------------
! ;-----------------------------------------
! ; General Settings - License Page Settings
! ;-----------------------------------------
; Select either "accept/do not accept" radio buttons or "accept" checkbox for the license page
! # !define MUI_LICENSEPAGE_RADIOBUTTONS
! !define MUI_LICENSEPAGE_CHECKBOX
!
! ;-----------------------------------------
! ; General Settings - Other Settings
! ;-----------------------------------------
! ; Show a message box with a warning when the user closes the installation
!define MUI_ABORTWARNING
!
! ;-----------------------------------------
! ; Interface Settings
! ;-----------------------------------------
!
! ; The "Special" bitmap appears on the "Welcome" and "Finish" pages,
! ; the "Header" bitmap appears on the other pages of the installer.
!
! !define MUI_SPECIALBITMAP "special.bmp"
! !define MUI_HEADERBITMAP "hdr-right.bmp"
! !define MUI_HEADERBITMAP_RIGHT
; The icon files for the installer and uninstaller must have the same structure. For example,
***************
*** 81,86 ****
!define MUI_UNICON "remove.ico"
! !define MUI_UNINSTALLER
! !define MUI_UNCONFIRMPAGE
#--------------------------------------------------------------------------
--- 106,116 ----
!define MUI_UNICON "remove.ico"
! ;-----------------------------------------
! ; Custom Functions added to MUI pages
! ;-----------------------------------------
!
! ; Use a "leave" function to look for 'popfile.cfg' in the directory selected for this install
!
! !define MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE CheckExistingConfig
#--------------------------------------------------------------------------
***************
*** 107,110 ****
--- 137,141 ----
"This wizard will guide you through the installation of ${MUI_PRODUCT}.\r\n\r\n\
It is recommended that you close all other applications before starting Setup.\r\n\r\n"
+
!insertmacro MUI_LANGUAGE "English"
***************
*** 133,150 ****
#--------------------------------------------------------------------------
- # Define the Page order for the installer
- #--------------------------------------------------------------------------
-
- !insertmacro MUI_PAGECOMMAND_WELCOME
- !insertmacro MUI_PAGECOMMAND_LICENSE
- !insertmacro MUI_PAGECOMMAND_COMPONENTS
- !insertmacro MUI_PAGECOMMAND_DIRECTORY
- Page custom SetOptionsPage "CheckPortOptions" ": Options"
- !insertmacro MUI_PAGECOMMAND_INSTFILES
- !insertmacro CBP_PAGECOMMAND_SELECTBUCKETS ": Create POPFile Buckets"
- Page custom SetOutlookOrOutlookExpressPage "" ": Configure Outlook Express"
- !insertmacro MUI_PAGECOMMAND_FINISH
-
- #--------------------------------------------------------------------------
# Component-selection page description text
#--------------------------------------------------------------------------
--- 164,167 ----
***************
*** 263,266 ****
--- 280,284 ----
Click 'Yes' to overwrite, click 'No' to skip making a backup copy" IDNO update_config
SetFileAttributes popfile.cfg.bak NORMAL
+
make_cfg_backup:
CopyFiles $INSTDIR\popfile.cfg $INSTDIR\popfile.cfg.bak
***************
*** 1362,1367 ****
"Note: $INSTDIR could not be removed."
Removed:
-
- !insertmacro MUI_UNFINISHHEADER
SectionEnd
--- 1380,1383 ----
|
