[popfile-commit] windows/test pfidbstatus.nsi, 1.3.2.3, 1.3.2.4 pfidiag.nsi, 1.8.4.3, 1.8.4.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: b0_22_2
	pfidbstatus.nsi pfidiag.nsi 
Log Message:
Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release).
Version Information now includes a trademark statement and has the build
year updated automatically.

Index: pfidbstatus.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** pfidbstatus.nsi	6 Feb 2006 14:18:44 -0000	1.3.2.3
--- pfidbstatus.nsi	29 Aug 2006 16:00:54 -0000	1.3.2.4
***************
*** 30,45 ****
  #-------------------------------------------------------------------------------------------

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

!   ; This version of the script has been tested with the "NSIS v2.19" compiler,
!   ; released 6 August 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download

    !define ${NSIS_VERSION}_found

!   !ifndef v2.19_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.19 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
***************
*** 157,161 ****
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.8"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "pfidbstatus.exe"

--- 157,161 ----
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.1.0"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "pfidbstatus.exe"

***************
*** 199,202 ****
--- 199,204 ----
    VIProductVersion                          "${C_VERSION}.0"

+   !define /date C_BUILD_YEAR                "%Y"
+ 
    !ifdef CTS_INTEGRATED
        VIAddVersionKey "ProductName"         "POPFile SQLite Database Status Check (integrated version)"
***************
*** 206,210 ****
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Check the status of POPFile's SQLite database"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"
--- 208,213 ----
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalTrademarks"         "POPFile is a registered trademark of John Graham-Cumming"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) ${C_BUILD_YEAR}  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Check the status of POPFile's SQLite database"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"

Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -C2 -d -r1.8.4.3 -r1.8.4.4
*** pfidiag.nsi	6 Feb 2006 14:17:53 -0000	1.8.4.3
--- pfidiag.nsi	29 Aug 2006 16:00:54 -0000	1.8.4.4
***************
*** 24,39 ****
  #--------------------------------------------------------------------------

!   ; 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***\
--- 24,39 ----
  #--------------------------------------------------------------------------

!   ; This version of the script has been tested with the "NSIS v2.19" compiler,
!   ; released 6 August 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download

    !define ${NSIS_VERSION}_found

!   !ifndef v2.19_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.19 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
***************
*** 104,108 ****
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.60"

    !define C_OUTFILE   "pfidiag.exe"
--- 104,108 ----
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.1.0"

    !define C_OUTFILE   "pfidiag.exe"
***************
*** 145,152 ****
    VIProductVersion                          "${C_VERSION}.0"

    VIAddVersionKey "ProductName"             "PFI Diagnostic Utility"
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "PFI Diagnostic Utility"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"
--- 145,155 ----
    VIProductVersion                          "${C_VERSION}.0"

+   !define /date C_BUILD_YEAR                "%Y"
+ 
    VIAddVersionKey "ProductName"             "PFI Diagnostic Utility"
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalTrademarks"         "POPFile is a registered trademark of John Graham-Cumming"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) ${C_BUILD_YEAR}  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "PFI Diagnostic Utility"
    VIAddVersionKey "FileVersion"             "${C_VERSION}"