[popfile-commit] windows getssl.nsh,1.6,1.7

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

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

Modified Files:
	getssl.nsh 
Log Message:
When the /SSL option is used the installer should shutdown POPFile
before installing or upgrading the SSL Support files.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** getssl.nsh	28 Jun 2005 13:39:00 -0000	1.6
--- getssl.nsh	3 Oct 2005 16:11:28 -0000	1.7
***************
*** 135,139 ****
  
        ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher
!       
        StrCpy ${L_RESULT} "built-in"
  
--- 135,139 ----
  
        ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher
! 
        StrCpy ${L_RESULT} "built-in"
  
***************
*** 141,145 ****
        IntCmp ${L_VER_Y} 8 0 restore_vars set_download_flag
        IntCmp ${L_VER_Z} 7 0 restore_vars set_download_flag
!       
      set_download_flag:
        StrCpy ${L_RESULT} "download"
--- 141,145 ----
        IntCmp ${L_VER_Y} 8 0 restore_vars set_download_flag
        IntCmp ${L_VER_Z} 7 0 restore_vars set_download_flag
! 
      set_download_flag:
        StrCpy ${L_RESULT} "download"
***************
*** 229,238 ****
        IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit
        IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit
!   !endif
  
!   !ifdef ADDSSL
!     install_SSL_support:
    !endif
  
    ; Now install the files required for SSL support
  
--- 229,246 ----
        IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit
        IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit
!       StrCmp $G_SSL_ONLY "0" install_SSL_support
  
!       ; The '/SSL' option was supplied so we need to make sure it is safe to install the files
! 
!       DetailPrint ""
!       SetDetailsPrint both
!       DetailPrint "$(PFI_LANG_PROG_CHECKIFRUNNING) $(PFI_LANG_TAKE_SEVERAL_SECONDS)"
!       SetDetailsPrint listonly
!       DetailPrint ""
!       Call MakeRootDirSafe
    !endif
  
+ install_SSL_support:
+ 
    ; Now install the files required for SSL support