[popfile-commit] windows/add-ons addssl.nsi, 1.3.4.13, 1.3.4.14 OnDemand.nsi, 1.1.2.6, 1.1.2.7

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

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

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

Index: OnDemand.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** OnDemand.nsi	3 Nov 2007 11:07:25 -0000	1.1.2.6
--- OnDemand.nsi	2 Apr 2008 20:17:33 -0000	1.1.2.7
***************
*** 10,14 ****
  #                   for new mail before POPFile is ready to accept commands).
  #
! # Copyright (c) 2005-2007 John Graham-Cumming
  #
  #   This file creates a utility for use with POPFile.
--- 10,14 ----
  #                   for new mail before POPFile is ready to accept commands).
  #
! # Copyright (c) 2005-2008 John Graham-Cumming
  #
  #   This file creates a utility for use with POPFile.
***************
*** 28,43 ****
  #-------------------------------------------------------------------------------------------

!   ; 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***\
--- 28,45 ----
  #-------------------------------------------------------------------------------------------

!   ; 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***\
***************
*** 47,50 ****
--- 49,53 ----

    !undef  ${NSIS_VERSION}_found
+   !undef  C_EXPECTED_VERSION

    ;--------------------------------------------------
***************
*** 65,69 ****
    ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional.
    ;
!   ; Tested using LockedList plugin v0.4 (RC2) timestamped 27 September 2007 19:42

  #-------------------------------------------------------------------------------------------
--- 68,72 ----
    ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional.
    ;
!   ; Tested using LockedList plugin v0.7 (RC2) timestamped 26 February 2008 17:49:24

  #-------------------------------------------------------------------------------------------
***************
*** 137,141 ****
    OutFile ${C_OUTFILE}

!   !define C_VERSION   "0.1.0"

    ; Specify the icon file for the utility
--- 140,144 ----
    OutFile ${C_OUTFILE}

!   !define C_VERSION   "0.1.1"

    ; Specify the icon file for the utility

Index: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.3.4.13
retrieving revision 1.3.4.14
diff -C2 -d -r1.3.4.13 -r1.3.4.14
*** addssl.nsi	4 Mar 2008 14:55:00 -0000	1.3.4.13
--- addssl.nsi	2 Apr 2008 20:17:33 -0000	1.3.4.14
***************
*** 54,69 ****
  #--------------------------------------------------------------------------

!   ; 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***\
--- 54,71 ----
  #--------------------------------------------------------------------------

!   ; 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***\
***************
*** 73,76 ****
--- 75,79 ----

    !undef  ${NSIS_VERSION}_found
+   !undef  C_EXPECTED_VERSION

    ;------------------------------------------------
***************
*** 268,272 ****
    Name                   "POPFile SSL Setup"

!   !define C_PFI_VERSION  "0.3.1"

    ; Mention the wizard's version number in the window title
--- 271,275 ----
    Name                   "POPFile SSL Setup"

!   !define C_PFI_VERSION  "0.3.2"

    ; Mention the wizard's version number in the window title