[popfile-commit] windows/test pfidbstatus.nsi,1.3.2.8,1.3.2.9

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

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

Modified Files:
      Tag: b0_22_2
	pfidbstatus.nsi 
Log Message:
Updated to work with current NSIS compiler (v2.36). Simplify the
code by using the new $EXEFILE constant.

Index: pfidbstatus.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -C2 -d -r1.3.2.8 -r1.3.2.9
*** pfidbstatus.nsi	29 Jul 2007 16:15:21 -0000	1.3.2.8
--- pfidbstatus.nsi	2 Apr 2008 20:12:36 -0000	1.3.2.9
***************
*** 12,16 ****
  #                           sqlite.exe version number before trying to execute any SQL.
  #
! # Copyright (c) 2005-2007  John Graham-Cumming
  #
  #   This file is part of POPFile
--- 12,16 ----
  #                           sqlite.exe version number before trying to execute any SQL.
  #
! # Copyright (c) 2005-2008  John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 30,45 ****
  #-------------------------------------------------------------------------------------------
  
!   ; 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***\
--- 30,47 ----
  #-------------------------------------------------------------------------------------------
  
!   ; 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***\
***************
*** 49,52 ****
--- 51,55 ----
  
    !undef  ${NSIS_VERSION}_found
+   !undef  C_EXPECTED_VERSION
  
    ;------------------------------------------------
***************
*** 157,161 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.1.6"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "pfidbstatus.exe"
  
--- 160,164 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.1.7"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "pfidbstatus.exe"
  
***************
*** 613,626 ****
  
    ; Ensure the correct program name appears in the 'usage' message added to the log.
-   ; The first system call gets the full pathname (returned in $R0) and the second call
-   ; extracts the filename (and possibly the extension) part (result returned in $R1)
  
!   Push $R0
!   Push $R1
!   System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)'
!   System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)'
!   StrCpy $G_PLS_FIELD_1 $R1
!   Pop $R1
!   Pop $R0
  
    DetailPrint ""
--- 616,621 ----
  
    ; Ensure the correct program name appears in the 'usage' message added to the log.
  
!   StrCpy $G_PLS_FIELD_1 $EXEFILE
  
    DetailPrint ""