[popfile-commit] windows pfi-library.nsh,1.39,1.40

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

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

Modified Files:
	pfi-library.nsh 
Log Message:
Add conditional compilation switches to allow compilation of the new Message
Capture utility used to display the SQL database conversion progress reports.

Update MinPerlMove to match the variable usage where it will be inserted.

Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** pfi-library.nsh	9 Jun 2004 15:10:47 -0000	1.39
--- pfi-library.nsh	24 Jun 2004 17:42:39 -0000	1.40
***************
*** 33,39 ****
  #
  # (1) ADDUSER          defined in adduser.nsi ('Add POPFile User' wizard)
! # (2) RUNPOPFILE       defined in runpopfile.nsi (simple front-end for popfile.exe)
! # (3) TRANSLATOR       defined in translator.nsi (main installer translations test program)
! # (4) TRANSLATOR_AUW   defined in transAUW.nsi ('Add POPFile User' translations test program)
  #--------------------------------------------------------------------------

--- 33,40 ----
  #
  # (1) ADDUSER          defined in adduser.nsi ('Add POPFile User' wizard)
! # (2) MSGCAPTURE       defined in msgcapture.nsi (used to capture POPFile's console messages)
! # (3) RUNPOPFILE       defined in runpopfile.nsi (simple front-end for popfile.exe)
! # (4) TRANSLATOR       defined in translator.nsi (main installer translations test program)
! # (5) TRANSLATOR_AUW   defined in transAUW.nsi ('Add POPFile User' translations test program)
  #--------------------------------------------------------------------------

***************
*** 163,168 ****
        !insertmacro PFI_UNIQUE_ID

!       IfFileExists "$INSTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID}
!       Rename "$INSTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}"

      skip_${PFI_UNIQUE_ID}:
--- 164,169 ----
        !insertmacro PFI_UNIQUE_ID

!       IfFileExists "$G_ROOTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID}
!       Rename "$G_ROOTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}"

      skip_${PFI_UNIQUE_ID}:
***************
*** 222,226 ****

! !ifndef ADDUSER & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetIEVersion
--- 223,227 ----

! !ifndef ADDUSER & MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetIEVersion
***************
*** 761,765 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: CheckIfLocked
--- 762,766 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: CheckIfLocked
***************
*** 771,775 ****
  !endif

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.CheckIfLocked
--- 772,776 ----
  !endif

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.CheckIfLocked
***************
*** 875,879 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: FindLockedPFE
--- 876,880 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: FindLockedPFE
***************
*** 885,889 ****
  !endif

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.FindLockedPFE
--- 886,890 ----
  !endif

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.FindLockedPFE
***************
*** 1468,1472 ****
  !macroend

! !ifdef ADDUSER | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetDateTimeStamp
--- 1469,1473 ----
  !macroend

! !ifdef ADDUSER | MSGCAPTURE | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetDateTimeStamp
***************
*** 1556,1560 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetFileSize
--- 1557,1561 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetFileSize
***************
*** 1566,1570 ****
  !endif

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.GetFileSize
--- 1567,1571 ----
  !endif

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.GetFileSize
***************
*** 1665,1669 ****
  !macroend

! !ifdef ADDUSER | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetLocalTime
--- 1666,1670 ----
  !macroend

! !ifdef ADDUSER | MSGCAPTURE | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetLocalTime
***************
*** 2003,2007 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceCall
--- 2004,2008 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceCall
***************
*** 2078,2082 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceRunning
--- 2079,2083 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceRunning
***************
*** 2273,2277 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: ShutdownViaUI
--- 2274,2278 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: ShutdownViaUI
***************
*** 2455,2459 ****
  !endif

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrCheckDecimal
--- 2456,2460 ----
  !endif

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrCheckDecimal
***************
*** 2528,2532 ****
  !macroend

! !ifndef TRANSLATOR
      #--------------------------------------------------------------------------
      # Installer Function: StrStr
--- 2529,2533 ----
  !macroend

! !ifndef MSGCAPTURE & TRANSLATOR
      #--------------------------------------------------------------------------
      # Installer Function: StrStr
***************
*** 2538,2542 ****
  !endif

! !ifndef ADDUSER & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrStr
--- 2539,2543 ----
  !endif

! !ifndef ADDUSER & MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrStr
***************
*** 2599,2603 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: TrimNewlines
--- 2600,2604 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: TrimNewlines
***************
*** 2609,2613 ****
  !endif

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.TrimNewlines
--- 2610,2614 ----
  !endif

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.TrimNewlines
***************
*** 2698,2702 ****
  !macroend

! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: WaitUntilUnlocked
--- 2699,2703 ----
  !macroend

! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: WaitUntilUnlocked