[popfile-commit] windows installer.nsi,1.73,1.74

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv7088

Modified Files:
	installer.nsi 
Log Message:
Make installer/uninstaller display user-friendly progress reports.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** installer.nsi	23 Jun 2003 11:42:40 -0000	1.73
--- installer.nsi	24 Jun 2003 00:41:20 -0000	1.74
***************
*** 42,47 ****
    VIAddVersionKey "FileVersion" "${MUI_VERSION}"
    
!   VIAddVersionKey "Build Type" "CVS Build (Experimental)"
!   VIAddVersionKey "Build Date" "${__DATE__} @ ${__TIME__}"
  
  #----------------------------------------------------------------------------------------
--- 42,48 ----
    VIAddVersionKey "FileVersion" "${MUI_VERSION}"
    
!   VIAddVersionKey "Build" "CVS Build (Experimental)"
!   VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
!   VIAddVersionKey "Build Script" "${__FILE__} (${__TIMESTAMP__})"
  
  #----------------------------------------------------------------------------------------
***************
*** 118,122 ****
    !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
  
!   ; Allow user to check the log file (by clicking "Show Details" button on the "Install" page)
  
  #  !define MUI_FINISHPAGE_NOAUTOCLOSE
--- 119,123 ----
    !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
  
!   ; Debug aid: Allow log file checking (by clicking "Show Details" button on the "Install" page)
  
  #  !define MUI_FINISHPAGE_NOAUTOCLOSE
***************
*** 280,283 ****
--- 281,288 ----
  
    SectionIn RO
+   
+   SetDetailsPrint textonly
+   DetailPrint "Checking for existing version of POPFile..."
+   SetDetailsPrint listonly
  
    ; If we are installing over a previous version, (try to) ensure that version is not running
***************
*** 295,298 ****
--- 300,307 ----
  
    ; Install the POPFile Core files
+   
+   SetDetailsPrint textonly
+   DetailPrint "Installing POPFile core files..."
+   SetDetailsPrint listonly
  
    SetOutPath $INSTDIR
***************
*** 372,375 ****
--- 381,388 ----
  
    ; Install the Minimal Perl files
+   
+   SetDetailsPrint textonly
+   DetailPrint "Installing minimal Perl files..."
+   SetDetailsPrint listonly
  
    SetOutPath $INSTDIR
***************
*** 462,465 ****
--- 475,482 ----
  
    ; Create the START MENU entries
+   
+   SetDetailsPrint textonly
+   DetailPrint "Creating POPFile shortcuts..."
+   SetDetailsPrint listonly
  
    SetOutPath $SMPROGRAMS\POPFile
***************
*** 505,508 ****
--- 522,529 ----
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" \
                "NoRepair" "1"
+   
+   SetDetailsPrint textonly
+   DetailPrint ""
+   SetDetailsPrint listonly
  
  SectionEnd
***************
*** 513,516 ****
--- 534,541 ----
  
  Section "Skins" SecSkins
+   
+   SetDetailsPrint textonly
+   DetailPrint "Installing POPFile skin files..."
+   SetDetailsPrint listonly
  
    SetOutPath $INSTDIR\skins
***************
*** 521,524 ****
--- 546,553 ----
    SetOutPath $INSTDIR\skins\sleetImages
    File "..\engine\skins\sleetImages\*.gif"
+   
+   SetDetailsPrint textonly
+   DetailPrint ""
+   SetDetailsPrint listonly
  
  SectionEnd
***************
*** 529,535 ****
--- 558,572 ----
  
  Section "Languages" SecLangs
+   
+   SetDetailsPrint textonly
+   DetailPrint "Installing POPFile UI language files..."
+   SetDetailsPrint listonly
  
    SetOutPath $INSTDIR\languages
    File "..\engine\languages\*.msg"
+   
+   SetDetailsPrint textonly
+   DetailPrint ""
+   SetDetailsPrint listonly
  
  SectionEnd
***************
*** 1610,1613 ****
--- 1647,1654 ----
    ; If the POPFile we are about to uninstall is still running,
    ; then one of the EXE files will be 'locked'
+   
+   SetDetailsPrint textonly
+   DetailPrint "Shutting down POPFile..."
+   SetDetailsPrint listonly
  
    IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
***************
*** 1655,1658 ****
--- 1696,1704 ----
  
  skip_shutdown:
+   
+   SetDetailsPrint textonly
+   DetailPrint "Deleting 'Start Menu' entries for POPFile..."
+   SetDetailsPrint listonly
+ 
    Delete $SMPROGRAMS\POPFile\Support\*.url
    RMDir $SMPROGRAMS\POPFile\Support
***************
*** 1662,1665 ****
--- 1708,1715 ----
    Delete "$SMSTARTUP\Run POPFile in background.lnk"
    RMDir $SMPROGRAMS\POPFile
+   
+   SetDetailsPrint textonly
+   DetailPrint "Deleting POPFile core files..."
+   SetDetailsPrint listonly
  
    Delete $INSTDIR\*.log
***************
*** 1676,1679 ****
--- 1726,1733 ----
    IfFileExists "$INSTDIR\popfile.reg" 0 no_reg_file
    
+   SetDetailsPrint textonly
+   DetailPrint "Restoring Outlook Express settings..."
+   SetDetailsPrint listonly
+   
    ; Read the registry settings found in popfile.reg and restore them
    ; it there are any.   All are assumed to be in HKCU
***************
*** 1723,1726 ****
--- 1777,1785 ----
    Delete $INSTDIR\Exporter\*.*
    RMDir $INSTDIR\Exporter
+   
+   SetDetailsPrint textonly
+   DetailPrint "Deleting POPFile skins files..."
+   SetDetailsPrint listonly
+ 
    Delete $INSTDIR\skins\*.css
    Delete $INSTDIR\skins\*.gif
***************
*** 1739,1742 ****
--- 1798,1805 ----
    Delete $INSTDIR\stopwords
    RMDir /r $INSTDIR\messages
+   
+   SetDetailsPrint textonly
+   DetailPrint "Deleting minimal Perl files..."
+   SetDetailsPrint listonly
  
    Delete $INSTDIR\Win32\API\*
***************
*** 1792,1795 ****
--- 1855,1860 ----
                   "Note: $INSTDIR could not be removed."
  Removed:
+   
+   SetDetailsPrint both
  
    !undef L_LNE