[popfile-commit] windows/test pfidiag.nsi,1.8.4.11,1.8.4.12

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

Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25905/test

Modified Files:
      Tag: b0_22_2
	pfidiag.nsi 
Log Message:
Updated to work with current NSIS compiler (v2.36)

Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.8.4.11
retrieving revision 1.8.4.12
diff -C2 -d -r1.8.4.11 -r1.8.4.12
*** pfidiag.nsi	10 Nov 2007 13:30:13 -0000	1.8.4.11
--- pfidiag.nsi	2 Apr 2008 20:17:34 -0000	1.8.4.12
***************
*** 5,9 ****
  #                 by the Windows installer for POPFile v0.21.0 (or later).
  #
! # Copyright (c) 2004-2007  John Graham-Cumming
  #
  #   This file is part of POPFile
--- 5,9 ----
  #                 by the Windows installer for POPFile v0.21.0 (or later).
  #
! # Copyright (c) 2004-2008  John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 24,39 ****
  #--------------------------------------------------------------------------
  
!   ; This version of the script has been tested with the "NSIS v2.22" compiler,
!   ; released 27 November 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef v2.22_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.22 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
--- 24,41 ----
  #--------------------------------------------------------------------------
  
!   ; This version of the script has been tested with the "NSIS v2.36" compiler,
!   ; released 29 March 2008. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download
! 
!   !define C_EXPECTED_VERSION  "v2.36"
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef ${C_EXPECTED_VERSION}_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS ${C_EXPECTED_VERSION} compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
***************
*** 43,47 ****
  
    !undef  ${NSIS_VERSION}_found
! 
  
    ;------------------------------------------------
--- 45,49 ----
  
    !undef  ${NSIS_VERSION}_found
!   !undef  C_EXPECTED_VERSION
  
    ;------------------------------------------------
***************
*** 104,108 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.1.9"
  
    !define C_OUTFILE   "pfidiag.exe"
--- 106,110 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.1.10"
  
    !define C_OUTFILE   "pfidiag.exe"