[popfile-commit] windows installer.nsi,1.146,1.147

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

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

Modified Files:
	installer.nsi 
Log Message:
Pass the POPFile version number data via the NSIS compiler command-line.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** installer.nsi	5 Nov 2003 15:08:23 -0000	1.146
--- installer.nsi	5 Nov 2003 18:29:53 -0000	1.147
***************
*** 46,58 ****
  
  #--------------------------------------------------------------------------
! # LANGUAGE SUPPORT:
  #
! # The installer defaults to multi-language mode ('English' plus a number of other languages).
  #
! # If required, a command-line switch can be used to build an English-only version.
  #
! # Normal multi-language build command:  makensis.exe installer.nsi
! # To build an English-only installer:   makensis.exe  /DENGLISH_MODE installer.nsi
  #
  #--------------------------------------------------------------------------
  # Removing support for a particular language:
--- 46,77 ----
  
  #--------------------------------------------------------------------------
! # POPFile Version Data:
  #
! # In order to simplify maintenance, the POPFile version number and 'Release Candidate' status
! # are passed as command-line parameters to the NSIS compiler.
  #
! # The following 4 parameters must be supplied (where x is a value in range 0 to 65535):
  #
! # (a) the Major Version number      (supplied as /DC_POPFILE_MAJOR_VERSION=x)
! # (b) the Minor Version number      (supplied as /DC_POPFILE_MINOR_VERSION=x)
! # (c) the Revision number           (supplied as /DC_POPFILE_REVISION=x)
! # (d) the Release Candidate number  (supplied as /DC_POPFILE_RC=RCx)
! #
! # Note that if a production build is required (i.e. not a Release Candidate), /DC_POPFILE_RC
! # can be used instead of /DC_POPFILE_RC=RCx
! #
! # For example, to build the installer for POPFile 0.20.1 the following command-line could be
! # used:
  #
+ # makensis.exe /DC_POPFILE_MAJOR_VERSION=0 /DC_POPFILE_MINOR_VERSION=20 /DC_POPFILE_REVISION=1 /DC_POPFILE_RC installer.nsi
+ #--------------------------------------------------------------------------
+ 
+ #--------------------------------------------------------------------------
+ # LANGUAGE SUPPORT:
+ #
+ # The installer defaults to multi-language mode ('English' plus a number of other languages).
+ #
+ # If required, the command-line switch /DENGLISH_MODE can be used to build an English-only
+ # version. This switch can appear before or after the four POPFile version number parameters.
  #--------------------------------------------------------------------------
  # Removing support for a particular language:
***************
*** 114,124 ****
    ;--------------------------------------------------------------------------
  
!   ReadEnvStr C_POPFILE_MAJOR_VERSION "POPFILE_MAJOR_VERSION"
!   ReadEnvStr C_POPFILE_MINOR_VERSION "POPFILE_MINOR_VERSION"
!   ReadEnvStr C_POPFILE_REVISION      "POPFILE_REVISION" 
!   ReadEnvStr C_POPFILE_RC            "RC" 
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${RC}"
  
    !define C_README        "v${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.change"
--- 133,154 ----
    ;--------------------------------------------------------------------------
  
!   !ifndef C_POPFILE_MAJOR_VERSION
!     !error "$\r$\n$\r$\nFatal error: POPFile Major Version parameter not supplied$\r$\n"
!   !endif
! 
!   !ifndef C_POPFILE_MINOR_VERSION
!     !error "$\r$\n$\r$\nFatal error: POPFile Minor Version parameter not supplied$\r$\n"
!   !endif
! 
!   !ifndef C_POPFILE_REVISION
!     !error "$\r$\n$\r$\nFatal error: POPFile Revision parameter not supplied$\r$\n"
!   !endif
! 
!   !ifndef C_POPFILE_RC
!     !error "$\r$\n$\r$\nFatal error: POPFile RC parameter not supplied$\r$\n"
!   !endif
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}"
  
    !define C_README        "v${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.change"
***************
*** 2152,2158 ****
    Push "1"
    Call SetConsoleMode
!   
    ; Remove the 'Click Next to convert the corpus' text (because we need to reboot first)
!   
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioD.ini" "Settings" "NumFields" "7"
  
--- 2182,2188 ----
    Push "1"
    Call SetConsoleMode
! 
    ; Remove the 'Click Next to convert the corpus' text (because we need to reboot first)
! 
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioD.ini" "Settings" "NumFields" "7"
  
***************
*** 2443,2449 ****
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioD.ini" "Settings" "NumFields" "0"
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0"
!   
    WriteINIStr "$INSTDIR\backup\backup.ini" "FlatFileCorpus" "Status" "old"
!   
    Goto selection_ok
  
--- 2473,2479 ----
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioD.ini" "Settings" "NumFields" "0"
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0"
! 
    WriteINIStr "$INSTDIR\backup\backup.ini" "FlatFileCorpus" "Status" "old"
! 
    Goto selection_ok
  
***************
*** 2476,2480 ****
    ; any changes to 'popfile.cfg' so the next time 'popfile.exe' is used to start POPFile, the
    ; the settings in 'popfile.cfg' will be used.
!   
    SetOutPath $INSTDIR
    ClearErrors
--- 2506,2510 ----
    ; any changes to 'popfile.cfg' so the next time 'popfile.exe' is used to start POPFile, the
    ; the settings in 'popfile.cfg' will be used.
! 
    SetOutPath $INSTDIR
    ClearErrors