[popfile-commit] windows adduser.nsi,1.59.4.7,1.59.4.8

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-serv10953

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

Extra data stored in the "Add/Remove Program" entry to stop Windows from
making wild guesses about how much space the POPFile User Data occupies.

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.7
retrieving revision 1.59.4.8
diff -C2 -d -r1.59.4.7 -r1.59.4.8
*** adduser.nsi	6 Feb 2006 18:56:58 -0000	1.59.4.7
--- adduser.nsi	29 Aug 2006 15:51:12 -0000	1.59.4.8
***************
*** 34,49 ****
  #--------------------------------------------------------------------------

!   ; 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***\
--- 34,49 ----
  #--------------------------------------------------------------------------

!   ; 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***\
***************
*** 54,60 ****
    !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).
- ;
  ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI
  ; 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese'
--- 54,57 ----
***************
*** 342,349 ****
    VIProductVersion                          "${C_PFI_VERSION}.0"

    VIAddVersionKey "ProductName"             "POPFile User wizard"
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Add/Remove POPFile User wizard"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
--- 339,349 ----
    VIProductVersion                          "${C_PFI_VERSION}.0"

+   !define /date C_BUILD_YEAR                "%Y"
+ 
    VIAddVersionKey "ProductName"             "POPFile User wizard"
    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"         "Add/Remove POPFile User wizard"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
***************
*** 1292,1295 ****
--- 1292,1297 ----
    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \
                "UninstallString" "$G_USERDIR\uninstalluser.exe"
+   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \
+               "InstallLocation" "$G_USERDIR"
    WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \
                "NoModify" "1"
***************
*** 2020,2024 ****
    StrCmp ${L_RESULT} "1" check_restore_log
    StrCpy $G_SFN_DISABLED "1"
!   
    ; Short file names are not supported here, so we cannot accept any path containing spaces.

--- 2022,2026 ----
    StrCmp ${L_RESULT} "1" check_restore_log
    StrCpy $G_SFN_DISABLED "1"
! 
    ; Short file names are not supported here, so we cannot accept any path containing spaces.

***************
*** 2609,2615 ****
    !endif

!   ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed

!   GetDlgItem $G_DLGITEM $G_HWND 1204            ; Field 5 = 'Run POPFile at startup' checkbox
    CreateFont $G_FONT "MS Shell Dlg" 10 700      ; use larger & bolder version of the font in use
    SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0
--- 2611,2617 ----
    !endif

!   ; Field 5 = 'Run POPFile at startup' checkbox control

!   !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioA.ini" "Field 5" "HWND"
    CreateFont $G_FONT "MS Shell Dlg" 10 700      ; use larger & bolder version of the font in use
    SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0