[popfile-commit] windows installer-Uninstall.nsh, 1.4.2.14, 1.4.2.15 installer.nsi, 1.242.4.16, 1.242.4.17

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

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

Modified Files:
      Tag: b0_22_2
	installer-Uninstall.nsh installer.nsi 
Log Message:
The optional IMAP component is no longer a single file.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.16
retrieving revision 1.242.4.17
diff -C2 -d -r1.242.4.16 -r1.242.4.17
*** installer.nsi	10 Nov 2007 13:43:08 -0000	1.242.4.16
--- installer.nsi	13 Nov 2007 22:58:10 -0000	1.242.4.17
***************
*** 201,205 ****
    ;--------------------------------------------------------------------------
  
! ;;  SetCompress off
  
    SetCompressor /solid lzma
--- 201,205 ----
    ;--------------------------------------------------------------------------
  
! ##  SetCompress off
  
    SetCompressor /solid lzma
***************
*** 1552,1555 ****
--- 1552,1558 ----
    File "..\engine\Services\IMAP.pm"
  
+   SetOutpath "$G_ROOTDIR\Services\IMAP"
+   File "..\engine\Services\IMAP\Client.pm"
+ 
    Delete "$G_ROOTDIR\POPFile\IMAP.pm"
    Delete "$G_ROOTDIR\Server\IMAP.pm"

Index: installer-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v
retrieving revision 1.4.2.14
retrieving revision 1.4.2.15
diff -C2 -d -r1.4.2.14 -r1.4.2.15
*** installer-Uninstall.nsh	10 Nov 2007 13:43:08 -0000	1.4.2.14
--- installer-Uninstall.nsh	13 Nov 2007 22:58:10 -0000	1.4.2.15
***************
*** 846,849 ****
--- 846,851 ----
    RMDir "$G_ROOTDIR\Server"
  
+   Delete "$G_ROOTDIR\Services\IMAP\*.pm"
+   RMDir "$G_ROOTDIR\Services\IMAP"
    Delete "$G_ROOTDIR\Services\*.pm"
    RMDir "$G_ROOTDIR\Services"
***************
*** 1152,1156 ****
  
    ; Uninstalluser.exe deletes all HKCU registry data except for the 'Add/Remove Programs' entry
!   
    ReadRegStr ${L_REGDATA} HKCU \
        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString"
--- 1154,1158 ----
  
    ; Uninstalluser.exe deletes all HKCU registry data except for the 'Add/Remove Programs' entry
! 
    ReadRegStr ${L_REGDATA} HKCU \
        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString"
***************
*** 1197,1201 ****
  
    Push ${L_REGDATA}
!   
    ReadRegStr ${L_REGDATA} HKCU \
        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString"
--- 1199,1203 ----
  
    Push ${L_REGDATA}
! 
    ReadRegStr ${L_REGDATA} HKCU \
        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString"
***************
*** 1207,1211 ****
  
    !undef L_REGDATA
!   
  FunctionEnd
  
--- 1209,1213 ----
  
    !undef L_REGDATA
! 
  FunctionEnd