[popfile-commit] windows/toolkit ap-vcheck.nsi,1.1.2.1,1.1.2.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

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

Index: ap-vcheck.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/toolkit/Attic/ap-vcheck.nsi,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ap-vcheck.nsi	12 May 2007 17:16:05 -0000	1.1.2.1
--- ap-vcheck.nsi	2 Apr 2008 20:17:33 -0000	1.1.2.2
***************
*** 9,13 ****
  #                   version of ActivePerl.
  #
! # Copyright (c) 2007  John Graham-Cumming
  #
  #   This file is part of POPFile
--- 9,13 ----
  #                   version of ActivePerl.
  #
! # Copyright (c) 2007-2008  John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 36,51 ****
  #-------------------------------------------------------------------------------------------

!   ; 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***\
--- 36,53 ----
  #-------------------------------------------------------------------------------------------

!   ; 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***\
***************
*** 55,58 ****
--- 57,61 ----

    !undef  ${NSIS_VERSION}_found
+   !undef  C_EXPECTED_VERSION

    ;--------------------------------------------------------------------------
***************
*** 70,78 ****
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.1"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "ap-vcheck.exe"

    Name "ActivePerl Version Check ${C_VERSION}"
!   
    ; Specify EXE filename and icon for the 'installer'

--- 73,81 ----
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.2"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "ap-vcheck.exe"

    Name "ActivePerl Version Check ${C_VERSION}"
! 
    ; Specify EXE filename and icon for the 'installer'

***************
*** 90,94 ****

    RequestExecutionLevel   user
!   
  #--------------------------------------------------------------------------

--- 93,97 ----

    RequestExecutionLevel   user
! 
  #--------------------------------------------------------------------------

***************
*** 118,126 ****

  #----------------------------------------------------------------------------------------
!   
  Section default

    !define C_DEF_AP_FOLDER     "!define C_AP_FOLDER   "
!   
    !define C_DEF_AP_MAJOR      "!define C_AP_MAJOR    "
    !define C_DEF_AP_MINOR      "!define C_AP_MINOR    "
--- 121,129 ----

  #----------------------------------------------------------------------------------------
! 
  Section default

    !define C_DEF_AP_FOLDER     "!define C_AP_FOLDER   "
! 
    !define C_DEF_AP_MAJOR      "!define C_AP_MAJOR    "
    !define C_DEF_AP_MINOR      "!define C_AP_MINOR    "
***************
*** 128,145 ****
    !define C_DEF_AP_BUILD      "!define C_AP_BUILD    "
    !define C_DEF_AP_VERSN      "!define C_AP_VERSION  "
!   
    !define C_DEF_AP_STATUS     "!define C_AP_STATUS   "
    !define C_DEF_AP_ERRMSG     "!define C_AP_ERRORMSG "
!   
    !define L_PERL_FOLDER   $R9     ; Location of ActivePerl installation (passed via the command-line)
    !define L_RESULTS_FILE  $R8     ; File handle used to access the output file (ap-version.nsh)
!   
    StrCpy ${L_PERL_FOLDER} ""
!   
    ; Get the location of the ActivePerl installation we are to check
!   
    Call GetParameters
    Pop ${L_PERL_FOLDER}
!   
    StrCmp ${L_PERL_FOLDER} "" 0 look_for_Perl
    FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w
--- 131,148 ----
    !define C_DEF_AP_BUILD      "!define C_AP_BUILD    "
    !define C_DEF_AP_VERSN      "!define C_AP_VERSION  "
! 
    !define C_DEF_AP_STATUS     "!define C_AP_STATUS   "
    !define C_DEF_AP_ERRMSG     "!define C_AP_ERRORMSG "
! 
    !define L_PERL_FOLDER   $R9     ; Location of ActivePerl installation (passed via the command-line)
    !define L_RESULTS_FILE  $R8     ; File handle used to access the output file (ap-version.nsh)
! 
    StrCpy ${L_PERL_FOLDER} ""
! 
    ; Get the location of the ActivePerl installation we are to check
! 
    Call GetParameters
    Pop ${L_PERL_FOLDER}
! 
    StrCmp ${L_PERL_FOLDER} "" 0 look_for_Perl
    FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w
***************
*** 148,152 ****
    FileClose ${L_RESULTS_FILE}
    Goto exit
!   
  look_for_Perl:
    IfFileExists "${L_PERL_FOLDER}\bin\*.*" look_for_DLL
--- 151,155 ----
    FileClose ${L_RESULTS_FILE}
    Goto exit
! 
  look_for_Perl:
    IfFileExists "${L_PERL_FOLDER}\bin\*.*" look_for_DLL
***************
*** 166,170 ****
    FileClose ${L_RESULTS_FILE}
    Goto exit
!   
  check_Perl_version:
    !define L_MAJOR     $R1
--- 169,173 ----
    FileClose ${L_RESULTS_FILE}
    Goto exit
! 
  check_Perl_version:
    !define L_MAJOR     $R1
***************
*** 188,192 ****
    FileWrite ${L_RESULTS_FILE}  "${C_DEF_AP_BUILD} $\"${L_BUILD}$\"${MB_NL}"
    FileClose ${L_RESULTS_FILE}
!   
   exit:
   SectionEnd
--- 191,195 ----
    FileWrite ${L_RESULTS_FILE}  "${C_DEF_AP_BUILD} $\"${L_BUILD}$\"${MB_NL}"
    FileClose ${L_RESULTS_FILE}
! 
   exit:
   SectionEnd