[popfile-commit] windows/test pfidiag.nsi,1.9,1.10

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

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

Modified Files:
	pfidiag.nsi 
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.

Library items now use the "PFI_" prefix to help identify them.

Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pfidiag.nsi	8 Jan 2005 15:00:06 -0000	1.9
--- pfidiag.nsi	2 Mar 2005 20:02:33 -0000	1.10
***************
*** 25,30 ****
  #--------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
  
  #--------------------------------------------------------------------------
--- 25,47 ----
  #--------------------------------------------------------------------------
  
!   ; This version of the script has been tested with the "NSIS 2.0" compiler (final),
!   ; released 7 February 2004, with no "official" NSIS patches applied. This compiler
!   ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download
! 
!   !define ${NSIS_VERSION}_found
! 
!   !ifndef v2.0_found
!       !warning \
!           "$\r$\n\
!           $\r$\n***   NSIS COMPILER WARNING:\
!           $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS 2.0 compiler\
!           $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
!           $\r$\n***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
  #--------------------------------------------------------------------------
***************
*** 61,65 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.51"
  
    !define C_OUTFILE   "pfidiag.exe"
--- 78,82 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.52"
  
    !define C_OUTFILE   "pfidiag.exe"
***************
*** 350,354 ****
    ; (for convenience the leading slash is stripped from the value used internally)
  
!   Call GetParameters
    Pop ${L_DIAG_MODE}
    StrCpy ${L_TEMP} ${L_DIAG_MODE} 1
--- 367,371 ----
    ; (for convenience the leading slash is stripped from the value used internally)
  
!   Call PFI_GetParameters
    Pop ${L_DIAG_MODE}
    StrCpy ${L_TEMP} ${L_DIAG_MODE} 1
***************
*** 414,418 ****
    DetailPrint "IsNT return code  = ${L_WIN_OS_TYPE}"
  
!   Call GetIEVersion
    Pop ${L_TEMP}
    DetailPrint "Internet Explorer = ${L_TEMP}"
--- 431,435 ----
    DetailPrint "IsNT return code  = ${L_WIN_OS_TYPE}"
  
!   Call PFI_GetIEVersion
    Pop ${L_TEMP}
    DetailPrint "Internet Explorer = ${L_TEMP}"
***************
*** 800,804 ****
    Push ${L_EXPECTED_ROOT}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_user
--- 817,821 ----
    Push ${L_EXPECTED_ROOT}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_user
***************
*** 820,824 ****
    Push ${L_EXPECTED_USER}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_vars
--- 837,841 ----
    Push ${L_EXPECTED_USER}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_vars
***************
*** 892,896 ****
  
  exit:
!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
--- 909,913 ----
  
  exit:
!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
***************
*** 988,992 ****
    Push ${L_TEMP}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" exit
--- 1005,1009 ----
    Push ${L_TEMP}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" exit