[popfile-commit] windows installer.nsi,1.242.4.24,1.242.4.25

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

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

Modified Files:
      Tag: b0_22_2
	installer.nsi 
Log Message:
When upgrading an existing installation include the SSL component when
comparing the list of currently selected components against the existing
POPFile installation.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.24
retrieving revision 1.242.4.25
diff -C2 -d -r1.242.4.24 -r1.242.4.25
*** installer.nsi	9 Jan 2008 12:22:05 -0000	1.242.4.24
--- installer.nsi	26 Jan 2008 14:54:58 -0000	1.242.4.25
***************
*** 2127,2130 ****
--- 2127,2131 ----
    ; version we are about to upgrade includes that program component then the user is asked for
    ; permission to upgrade the component [To do: disable the component if user says 'No' ??]
+   ; Check the components in alphabetic order for the sake of convenience.
  
    !insertmacro SectionFlagIsSet ${SecIMAP} ${SF_SELECTED} check_nntp look_for_imap
***************
*** 2165,2178 ****
  
  check_socks:
!   !insertmacro SectionFlagIsSet ${SecSOCKS} ${SF_SELECTED} check_xmlrpc look_for_socks
  
  look_for_socks:
!   IfFileExists "$G_ROOTDIR\lib\IO\Socket\Socks.pm" 0 check_xmlrpc
    StrCpy $G_PLS_FIELD_1 "SOCKS support"
    MessageBox MB_YESNO|MB_ICONQUESTION "$(MBCOMPONENT_PROB_1)\
        ${MB_NL}${MB_NL}\
!       $(MBCOMPONENT_PROB_2)" IDNO check_xmlrpc
    !insertmacro SelectSection ${SecSOCKS}
  
  check_xmlrpc:
    !insertmacro SectionFlagIsSet ${SecXMLRPC} ${SF_SELECTED} continue look_for_xmlrpc
--- 2166,2190 ----
  
  check_socks:
!   !insertmacro SectionFlagIsSet ${SecSOCKS} ${SF_SELECTED} check_ssl look_for_socks
  
  look_for_socks:
!   IfFileExists "$G_ROOTDIR\lib\IO\Socket\Socks.pm" 0 check_ssl
    StrCpy $G_PLS_FIELD_1 "SOCKS support"
    MessageBox MB_YESNO|MB_ICONQUESTION "$(MBCOMPONENT_PROB_1)\
        ${MB_NL}${MB_NL}\
!       $(MBCOMPONENT_PROB_2)" IDNO check_ssl
    !insertmacro SelectSection ${SecSOCKS}
  
+ check_ssl:
+   !insertmacro SectionFlagIsSet ${SecSSL} ${SF_SELECTED} check_xmlrpc look_for_ssl
+ 
+ look_for_ssl:
+   IfFileExists "$G_ROOTDIR\lib\Net\SSLeay.pm" 0 check_xmlrpc
+   StrCpy $G_PLS_FIELD_1 "SSL Support"
+   MessageBox MB_YESNO|MB_ICONQUESTION "$(MBCOMPONENT_PROB_1)\
+       ${MB_NL}${MB_NL}\
+       $(MBCOMPONENT_PROB_2)" IDNO check_xmlrpc
+   !insertmacro SelectSection ${SecSSL}
+ 
  check_xmlrpc:
    !insertmacro SectionFlagIsSet ${SecXMLRPC} ${SF_SELECTED} continue look_for_xmlrpc