[popfile-commit] windows installer-SecMinPerl-body.nsh,1.1,1.2 installer-Uninstall.nsh,1.1,1.2 installer.nsi,1.258,1.259

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

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

Modified Files:
	installer-SecMinPerl-body.nsh installer-Uninstall.nsh 
	installer.nsi 
Log Message:
Update the minimal Perl to suit ActivePerl 5.8.7 (new Perl dependencies)

The minimal Perl needs to be updated to support the current SSL components
from the University of Winnipeg and to fix the LSP-compatibility problem
(e.g PGP Desktop 9.0 stops the Windows version of 0.22.2 from working).

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.258
retrieving revision 1.259
diff -C2 -d -r1.258 -r1.259
*** installer.nsi	1 Jul 2005 09:51:31 -0000	1.258
--- installer.nsi	2 Aug 2005 23:23:24 -0000	1.259
***************
*** 1101,1110 ****
  
        ;--------------------------------------------------------------------------
!       ; Install Perl modules: base.pm, bytes.pm, the Encode collection and Text::Kakasi
        ;--------------------------------------------------------------------------
  
        SetOutPath "$G_MPLIBDIR"
        File "${C_PERL_DIR}\lib\base.pm"
-       File "${C_PERL_DIR}\lib\bytes.pm"
        File "${C_PERL_DIR}\lib\Encode.pm"
  
--- 1101,1111 ----
  
        ;--------------------------------------------------------------------------
!       ; Install Perl modules: base.pm, the entire Encode collection and Text::Kakasi
!       ; (bytes.pm and bytes_heavy.pl are also required but these files became part of
!       ; the standard minimal Perl when support for encrypted cookies was added for 0.23.0)
        ;--------------------------------------------------------------------------
  
        SetOutPath "$G_MPLIBDIR"
        File "${C_PERL_DIR}\lib\base.pm"
        File "${C_PERL_DIR}\lib\Encode.pm"
  

Index: installer-SecMinPerl-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** installer-SecMinPerl-body.nsh	2 Mar 2005 19:53:41 -0000	1.1
--- installer-SecMinPerl-body.nsh	2 Aug 2005 23:23:24 -0000	1.2
***************
*** 42,45 ****
--- 42,51 ----
    ; extra Perl components which are added when the optional POPFile components are installed.
  
+   ; The 0.22.2 release's minimal Perl was based upon ActivePerl 5.8.4 but the optional SSL
+   ; components from the University of Winnipeg repository are no longer compatible with this
+   ; version of ActivePerl. ActivePerl 5.8.7 (the most recent version at the time of writing)
+   ; introduced some new dependencies so this section assumes the minimal Perl will be based
+   ; upon ActivePerl 5.8.7.
+ 
    !insertmacro SECTIONLOG_ENTER "Minimal Perl"
  
***************
*** 71,74 ****
--- 77,81 ----
    File "${C_PERL_DIR}\lib\Carp.pm"
    File "${C_PERL_DIR}\lib\Config.pm"
+   File "${C_PERL_DIR}\lib\Config_heavy.pl"
    File "${C_PERL_DIR}\lib\constant.pm"
    File "${C_PERL_DIR}\lib\DynaLoader.pm"
***************
*** 216,219 ****
--- 223,227 ----
    SetOutPath "$G_MPLIBDIR"
    File "${C_PERL_DIR}\lib\bytes.pm"
+   File "${C_PERL_DIR}\lib\bytes_heavy.pl"
    File "${C_PERL_DIR}\lib\subs.pm"
  

Index: installer-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** installer-Uninstall.nsh	2 Mar 2005 19:53:41 -0000	1.1
--- installer-Uninstall.nsh	2 Aug 2005 23:23:24 -0000	1.2
***************
*** 690,693 ****
--- 690,694 ----
  skip_Win32:
    Delete "$G_MPLIBDIR\*.pm"
+   Delete "$G_MPLIBDIR\*.pl"
    RMDIR "$G_MPLIBDIR"