[popfile-commit] windows installer.nsi,1.242.4.5,1.242.4.6

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

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

Modified Files:
      Tag: b0_22_2
	installer.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.

Replaced the slow script-based installation log dump function with one
which uses a much faster plugin.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.5
retrieving revision 1.242.4.6
diff -C2 -d -r1.242.4.5 -r1.242.4.6
*** installer.nsi	6 Feb 2006 18:56:58 -0000	1.242.4.5
--- installer.nsi	29 Aug 2006 15:55:45 -0000	1.242.4.6
***************
*** 11,19 ****
  #
  #                       (1) adduser.exe     (NSIS script: adduser.nsi)
! #                       (2) ctchecks.exe    (NSIS script: ctchecks.nsi)
! #                       (3) msgcapture.exe  (NSIS script: msgcapture.nsi)
! #                       (4) runpopfile.exe  (NSIS script: runpopfile.nsi)
! #                       (5) runsqlite.exe   (NSIS script: runsqlite.nsi)
! #                       (6) stop_pf.exe     (NSIS script: stop_popfile.nsi)
  #
  #                   (B) The following programs (built using NSIS) are optional:
--- 11,18 ----
  #
  #                       (1) adduser.exe     (NSIS script: adduser.nsi)
! #                       (2) msgcapture.exe  (NSIS script: msgcapture.nsi)
! #                       (3) runpopfile.exe  (NSIS script: runpopfile.nsi)
! #                       (4) runsqlite.exe   (NSIS script: runsqlite.nsi)
! #                       (5) stop_pf.exe     (NSIS script: stop_popfile.nsi)
  #
  #                   (B) The following programs (built using NSIS) are optional:
***************
*** 49,64 ****
  #--------------------------------------------------------------------------

!   ; 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***\
--- 48,63 ----
  #--------------------------------------------------------------------------

!   ; 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***\
***************
*** 68,78 ****

    !undef  ${NSIS_VERSION}_found
!   
! ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date
! ; (if the default multi-language installer is compiled).
! ;
! ; There may be further warnings which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or
! ; more language tables. The 'pfi-languages.nsh' file lists all of the language table codes
! ; used by the POPFile installer and other NSIS-based utilities.
  ;
  ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI
--- 67,75 ----

    !undef  ${NSIS_VERSION}_found
! 
! ; Normally no NSIS compiler warnings are expected. However there may be some warnings
! ; which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or more language tables.
! ; These "PFI_LANG_NSISDL_PLURAL" warnings can be safely ignored (at present only the
! ; 'Japanese-pfi.nsh' file generates this warning).
  ;
  ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI
***************
*** 185,189 ****
    ;--------------------------------------------------------------------------

!   SetCompressor lzma

    ;--------------------------------------------------------------------------
--- 182,186 ----
    ;--------------------------------------------------------------------------

!   SetCompressor /solid lzma

    ;--------------------------------------------------------------------------
***************
*** 368,375 ****
    VIProductVersion "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.0"

    VIAddVersionKey "ProductName"             "${C_PFI_PRODUCT}"
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "POPFile Automatic email classification"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
--- 365,375 ----
    VIProductVersion "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.0"

+   !define /date C_BUILD_YEAR                "%Y"
+ 
    VIAddVersionKey "ProductName"             "${C_PFI_PRODUCT}"
    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"         "POPFile Automatic email classification"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
***************
*** 676,679 ****
--- 676,680 ----
    !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
    ReserveFile "${NSISDIR}\Plugins\Banner.dll"
+   ReserveFile "${NSISDIR}\Plugins\DumpLog.dll"
    ReserveFile "${NSISDIR}\Plugins\NSISdl.dll"
    ReserveFile "${NSISDIR}\Plugins\System.dll"
***************
*** 1323,1327 ****

    SetDetailsPrint textonly
!   DetailPrint "$(PFI_LANG_PROG_SAVELOG) $(PFI_LANG_TAKE_SEVERAL_SECONDS)"
    SetDetailsPrint listonly
    Call PFI_GetDateTimeStamp
--- 1324,1328 ----

    SetDetailsPrint textonly
!   DetailPrint "$(PFI_LANG_PROG_SAVELOG)"
    SetDetailsPrint listonly
    Call PFI_GetDateTimeStamp
***************
*** 1496,1500 ****

    ; Convert the installation pathname into a string which is safe to use in the summary page
!   
    Push $G_ROOTDIR
    Call NSIS2IO
--- 1497,1501 ----

    ; Convert the installation pathname into a string which is safe to use in the summary page
! 
    Push $G_ROOTDIR
    Call NSIS2IO