[popfile-commit] windows WriteEnvStr.nsh,1.12,1.13

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

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

Modified Files:
	WriteEnvStr.nsh 
Log Message:
Library items now use the "PFI_" prefix to help identify them.

Index: WriteEnvStr.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** WriteEnvStr.nsh	9 Oct 2004 14:02:51 -0000	1.12
--- WriteEnvStr.nsh	2 Mar 2005 19:57:59 -0000	1.13
***************
*** 5,9 ****
  #                     'Kakasi' package.
  #
! # Copyright (c) 2003-2004 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 5,9 ----
  #                     'Kakasi' package.
  #
! # Copyright (c) 2003-2005 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 44,48 ****
  !ifndef ADDUSER & NO_KAKASI
      #--------------------------------------------------------------------------
!     # Installer Function: WriteEnv
      #
      # Writes an environment variable which is available to the 'current user' on a modern OS.
--- 44,48 ----
  !ifndef ADDUSER & NO_KAKASI
      #--------------------------------------------------------------------------
!     # Installer Function: PFI_WriteEnv
      #
      # Writes an environment variable which is available to the 'current user' on a modern OS.
***************
*** 60,68 ****
      #         Push "HOMEDIR"
      #         Push "C:\New Home Dir"
!     #         Call WriteEnvStr
      #
      #--------------------------------------------------------------------------
  
!     Function WriteEnvStr
  
        ; Registers common to Win9x and non-Win9x processing
--- 60,68 ----
      #         Push "HOMEDIR"
      #         Push "C:\New Home Dir"
!     #         Call PFI_WriteEnvStr
      #
      #--------------------------------------------------------------------------
  
!     Function PFI_WriteEnvStr
  
        ; Registers common to Win9x and non-Win9x processing
***************
*** 87,91 ****
        Push ${TEMP}
  
!       Call IsNT
        Pop ${TEMP}
        StrCmp ${TEMP} 1 WriteEnvStr_NT
--- 87,91 ----
        Push ${TEMP}
  
!       Call PFI_IsNT
        Pop ${TEMP}
        StrCmp ${TEMP} 1 WriteEnvStr_NT
***************
*** 115,119 ****
        StrCmp ${LINE} "" eof_found
        Push ${LINE}
!       Call TrimNewlines
        Pop ${LINE}
        StrCmp ${LINE} "" copy_line           ; Blank lines are preserved in the copy we make
--- 115,119 ----
        StrCmp ${LINE} "" eof_found
        Push ${LINE}
!       Call PFI_TrimNewlines
        Pop ${LINE}
        StrCmp ${LINE} "" copy_line           ; Blank lines are preserved in the copy we make
***************
*** 190,194 ****
  
      #--------------------------------------------------------------------------
!     # Installer Function: WriteEnvNTAU
      #
      # Writes an environment variable which is available to all users on a modern OS.
--- 190,194 ----
  
      #--------------------------------------------------------------------------
!     # Installer Function: PFI_WriteEnvNTAU
      #
      # Writes an environment variable which is available to all users on a modern OS.
***************
*** 206,214 ****
      #         Push "HOMEDIR"
      #         Push "C:\New Home Dir"
!     #         Call WriteEnvStrNTAU
      #
      #--------------------------------------------------------------------------
  
!     Function WriteEnvStrNTAU
  
        ; Registers common to Win9x and non-Win9x processing
--- 206,214 ----
      #         Push "HOMEDIR"
      #         Push "C:\New Home Dir"
!     #         Call PFI_WriteEnvStrNTAU
      #
      #--------------------------------------------------------------------------
  
!     Function PFI_WriteEnvStrNTAU
  
        ; Registers common to Win9x and non-Win9x processing
***************
*** 233,237 ****
        Push ${TEMP}
  
!       Call IsNT
        Pop ${TEMP}
        StrCmp ${TEMP} 1 WriteEnvStr_NT
--- 233,237 ----
        Push ${TEMP}
  
!       Call PFI_IsNT
        Pop ${TEMP}
        StrCmp ${TEMP} 1 WriteEnvStr_NT
***************
*** 261,265 ****
        StrCmp ${LINE} "" eof_found
        Push ${LINE}
!       Call TrimNewlines
        Pop ${LINE}
        StrCmp ${LINE} "" copy_line           ; Blank lines are preserved in the copy we make
--- 261,265 ----
        StrCmp ${LINE} "" eof_found
        Push ${LINE}
!       Call PFI_TrimNewlines
        Pop ${LINE}
        StrCmp ${LINE} "" copy_line           ; Blank lines are preserved in the copy we make
***************
*** 338,342 ****
  !ifndef ADDUSER
      #--------------------------------------------------------------------------
!     # Uninstaller Function: un.DeleteEnvStr
      #
      # Removes an environment variable defined for the current user on a modern OS.
--- 338,342 ----
  !ifndef ADDUSER
      #--------------------------------------------------------------------------
!     # Uninstaller Function: un.PFI_DeleteEnvStr
      #
      # Removes an environment variable defined for the current user on a modern OS.
***************
*** 351,359 ****
      # Usage:
      #         Push "HOMEDIR"
!     #         Call un.DeleteEnvStr
      #
      #--------------------------------------------------------------------------
  
!     Function un.DeleteEnvStr
        Exch $0       ; $0 now has the name of the variable
        Push $1
--- 351,359 ----
      # Usage:
      #         Push "HOMEDIR"
!     #         Call un.PFI_DeleteEnvStr
      #
      #--------------------------------------------------------------------------
  
!     Function un.PFI_DeleteEnvStr
        Exch $0       ; $0 now has the name of the variable
        Push $1
***************
*** 363,367 ****
        Push $5
  
!       Call un.IsNT
        Pop $1
        StrCmp $1 1 DeleteEnvStr_NT
--- 363,367 ----
        Push $5
  
!       Call un.PFI_IsNT
        Pop $1
        StrCmp $1 1 DeleteEnvStr_NT
***************
*** 420,424 ****
  
      #--------------------------------------------------------------------------
!     # Uninstaller Function: un.DeleteEnvStrNTAU
      #
      # Removes an environment variable defined for all users on a modern OS.
--- 420,424 ----
  
      #--------------------------------------------------------------------------
!     # Uninstaller Function: un.PFI_DeleteEnvStrNTAU
      #
      # Removes an environment variable defined for all users on a modern OS.
***************
*** 433,441 ****
      # Usage:
      #         Push "HOMEDIR"
!     #         Call un.DeleteEnvStrNTAU
      #
      #--------------------------------------------------------------------------
  
!     Function un.DeleteEnvStrNTAU
        Exch $0       ; $0 now has the name of the variable
        Push $1
--- 433,441 ----
      # Usage:
      #         Push "HOMEDIR"
!     #         Call un.PFI_DeleteEnvStrNTAU
      #
      #--------------------------------------------------------------------------
  
!     Function un.PFI_DeleteEnvStrNTAU
        Exch $0       ; $0 now has the name of the variable
        Push $1
***************
*** 445,449 ****
        Push $5
  
!       Call un.IsNT
        Pop $1
        StrCmp $1 1 DeleteEnvStr_NT
--- 445,449 ----
        Push $5
  
!       Call un.PFI_IsNT
        Pop $1
        StrCmp $1 1 DeleteEnvStr_NT
***************
*** 508,512 ****
  
  #--------------------------------------------------------------------------
! # Macro: IsNT
  #
  # The installation process and the uninstall process both use a function which checks if
--- 508,512 ----
  
  #--------------------------------------------------------------------------
! # Macro: PFI_IsNT
  #
  # The installation process and the uninstall process both use a function which checks if
***************
*** 518,523 ****
  #
  # NOTE:
! # The !insertmacro IsNT "" and !insertmacro IsNT "un." commands are included in this file so
! # 'installer.nsi' can use 'Call IsNT' and 'Call un.IsNT' without additional preparation.
  #
  # Inputs:
--- 518,523 ----
  #
  # NOTE:
! # The !insertmacro PFI_IsNT "" and !insertmacro PFI_IsNT "un." commands are included in this file so
! # 'installer.nsi' can use 'Call PFI_IsNT' and 'Call un.PFI_IsNT' without additional preparation.
  #
  # Inputs:
***************
*** 529,533 ****
  #  Usage (after macro has been 'inserted'):
  #
! #         Call un.IsNT
  #         Pop $R0
  #
--- 529,533 ----
  #  Usage (after macro has been 'inserted'):
  #
! #         Call un.PFI_IsNT
  #         Pop $R0
  #
***************
*** 536,541 ****
  #--------------------------------------------------------------------------
  
! !macro IsNT UN
!   Function ${UN}IsNT
      Push $0
      ReadRegStr $0 HKLM \
--- 536,541 ----
  #--------------------------------------------------------------------------
  
! !macro PFI_IsNT UN
!   Function ${UN}PFI_IsNT
      Push $0
      ReadRegStr $0 HKLM \
***************
*** 555,572 ****
  
  #--------------------------------------------------------------------------
! # Installer Function: IsNT
  #
  # This function is used during the installation process
  #--------------------------------------------------------------------------
  
! !insertmacro IsNT ""
  
  #--------------------------------------------------------------------------
! # Uninstaller Function: un.IsNT
  #
  # This function is used during the uninstall process
  #--------------------------------------------------------------------------
  
! !insertmacro IsNT "un."
  
  #--------------------------------------------------------------------------
--- 555,572 ----
  
  #--------------------------------------------------------------------------
! # Installer Function: PFI_IsNT
  #
  # This function is used during the installation process
  #--------------------------------------------------------------------------
  
! !insertmacro PFI_IsNT ""
  
  #--------------------------------------------------------------------------
! # Uninstaller Function: un.PFI_IsNT
  #
  # This function is used during the uninstall process
  #--------------------------------------------------------------------------
  
! !insertmacro PFI_IsNT "un."
  
  #--------------------------------------------------------------------------