[popfile-commit] windows installer-SecMinPerl-body.nsh, 1.2.2.9, 1.2.2.10 installer-Uninstall.nsh, 1.4.2.17, 1.4.2.18

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

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

Modified Files:
      Tag: b0_22_2
	installer-SecMinPerl-body.nsh installer-Uninstall.nsh 
Log Message:
Update the minimal Perl to take into account a new dependency
introduced in the 5.8.8 Build 822 release.

Index: installer-SecMinPerl-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -d -r1.2.2.9 -r1.2.2.10
*** installer-SecMinPerl-body.nsh	12 May 2007 17:12:30 -0000	1.2.2.9
--- installer-SecMinPerl-body.nsh	1 Dec 2007 15:18:30 -0000	1.2.2.10
***************
*** 38,43 ****
  
    ; This section installs the "core" version of the minimal Perl. Some of the optional
!   ; POPFile components, such as the Kakasi package and POPFile's XMLRPC module, require
!   ; extra Perl components which are added when the optional POPFile components are installed.
  
    !insertmacro SECTIONLOG_ENTER "Minimal Perl"
--- 38,44 ----
  
    ; This section installs the "core" version of the minimal Perl. Some of the optional
!   ; POPFile components, such as the Nihongo (Japanese) parser and POPFile's XMLRPC
!   ; module, require extra Perl components which are added when the optional POPFile
!   ; components are installed.
  
    !insertmacro SECTIONLOG_ENTER "Minimal Perl"
***************
*** 49,54 ****
    SetDetailsPrint listonly
  
!   ; Install the minimal Perl "core" based upon ActivePerl 5.8.8 Build 820
!   ; (extra Perl files are added by the "Kakasi", "SOCKS" & "XMLRPC" sections in installer.nsi)
  
    SetOutPath "$G_ROOTDIR"
--- 50,57 ----
    SetDetailsPrint listonly
  
!   ; Install the minimal Perl "core" based upon ActivePerl 5.8.8 Build 822
!   ; (extra Perl files are added by the "SOCKS" & "XMLRPC" sections in installer.nsi
!   ; and by the macro-based "Kakasi", "MeCab" and "InternalParser" sections defined
!   ; in getparser.nsh)
  
    SetOutPath "$G_ROOTDIR"
***************
*** 119,123 ****
    SetOutPath "$G_MPLIBDIR\List"
    File "${C_PERL_DIR}\lib\List\Util.pm"
!   
    SetOutPath "$G_MPLIBDIR\MIME"
    File "${C_PERL_DIR}\lib\MIME\*"
--- 122,126 ----
    SetOutPath "$G_MPLIBDIR\List"
    File "${C_PERL_DIR}\lib\List\Util.pm"
! 
    SetOutPath "$G_MPLIBDIR\MIME"
    File "${C_PERL_DIR}\lib\MIME\*"
***************
*** 132,135 ****
--- 135,141 ----
    File "${C_PERL_DIR}\lib\Text\ParseWords.pm"
  
+   SetOutPath "$G_MPLIBDIR\Tie"
+   File "${C_PERL_DIR}\lib\Tie\Hash.pm"
+ 
    SetOutPath "$G_MPLIBDIR\Time"
    File "${C_PERL_DIR}\site\lib\Time\Local.pm"
***************
*** 205,209 ****
    File "${C_PERL_DIR}\lib\auto\DBI\DBI.lib"
  
!   ; Install SQLite2 support. The 0.22.5 release is based upon ActivePerl 5.8.8 Build 820
    ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using
    ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release
--- 211,215 ----
    File "${C_PERL_DIR}\lib\auto\DBI\DBI.lib"
  
!   ; Install SQLite2 support. The 0.22.5 release was based upon ActivePerl 5.8.8 Build 820
    ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using
    ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release

Index: installer-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -C2 -d -r1.4.2.17 -r1.4.2.18
*** installer-Uninstall.nsh	24 Nov 2007 00:11:34 -0000	1.4.2.17
--- installer-Uninstall.nsh	1 Dec 2007 15:18:30 -0000	1.4.2.18
***************
*** 1152,1155 ****
--- 1152,1156 ----
    RMDir /r "$G_MPLIBDIR\Sys"
    RMDir /r "$G_MPLIBDIR\Text"
+   RMDir /r "$G_MPLIBDIR\Tie"
    RMDir /r "$G_MPLIBDIR\Time"
    RMDir /r "$G_MPLIBDIR\warnings"