Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10522
Modified Files:
Tag: b0_22_2
installer-Uninstall.nsh installer.nsi WriteEnvStr.nsh
Added Files:
Tag: b0_22_2
ioP.ini
Log Message:
Previous releases of POPFile only supported one parser (Kakasi) for
Japanese text. Update the installer to offer a choice of 3 parsers
(Kakasi, MeCab and Internal) when Nihongo is selected. The MeCab files
are too big to include in the installer so they will be downloaded
during the installation if the MeCab option is selected.
The new Nihongo Parser pages and text are only shown when Nihongo is
selected (or if an English-only build is made) so string constants are
used instead of LanguageString commands (in order to keep things simple).
Removed support for the NO_KAKASI compile-time switch as it is no
longer relevant. (May introduce a similar switch affecting all of
the Nihongo Parser selection handling later on.)
Fix the bug in the NSIS2IO function that truncated MBCS strings.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.12
retrieving revision 1.242.4.13
diff -C2 -d -r1.242.4.12 -r1.242.4.13
*** installer.nsi 21 Sep 2007 01:18:53 -0000 1.242.4.12
--- installer.nsi 5 Oct 2007 18:36:52 -0000 1.242.4.13
***************
*** 46,49 ****
--- 46,50 ----
# (4) installer-SecMinPerl-body.nsh - body of section used to install the basic minimal Perl
# (5) installer-Uninstall.nsh - source for the POPFile uninstaller (uninstall.exe)
+ # (6) getssl.nsh - section & functions used to download the SSL support files
#--------------------------------------------------------------------------
***************
*** 129,139 ****
# the installer, it does not affect which files get installed.
#
[...1155 lines suppressed...]
! IntOp ${L_LENGTH} ${L_LENGTH} + 1
Goto loop
! ; Return "InstallOptions-safe" string
!
! exit:
! Pop ${L_CONVERTED}
! Pop ${L_CURRENT}
! Pop ${L_OFFSET}
! Pop ${L_LENGTH}
! Exch ${L_STRING}
!
! !undef L_STRING
! !undef L_LENGTH
! !undef L_OFFSET
! !undef L_CURRENT
! !undef L_CONVERTED
!
FunctionEnd
Index: installer-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -d -r1.4.2.9 -r1.4.2.10
*** installer-Uninstall.nsh 21 Sep 2007 01:19:45 -0000 1.4.2.9
--- installer-Uninstall.nsh 5 Oct 2007 18:36:52 -0000 1.4.2.10
***************
*** 578,581 ****
--- 578,626 ----
#--------------------------------------------------------------------------
+ # Uninstaller Section: 'un.MeCab'
+ #--------------------------------------------------------------------------
+
+ Section "un.MeCab" UnSecMeCab
+
+ !define L_TEMP $R9
+
+ Push ${L_TEMP}
+
+ IfFileExists "$INSTDIR\mecab\*.*" 0 section_exit
+
+ SetDetailsPrint textonly
+ DetailPrint " "
+ SetDetailsPrint listonly
+
+ RMDir /r "$INSTDIR\mecab"
+
+ ;Delete Environment Variables
+
+ Push "MECABRC"
+ Call un.PFI_DeleteEnvStr
+
+ ; If the 'all users' environment variables refer to this installation, remove them too
+
+ ReadEnvStr ${L_TEMP} "MECABRC"
+ Push ${L_TEMP}
+ Push $INSTDIR
+ Call un.PFI_StrStr
+ Pop ${L_TEMP}
+ StrCmp ${L_TEMP} "" section_exit
+ Push "MECABRC"
+ Call un.PFI_DeleteEnvStrNTAU
+
+ section_exit:
+ SetDetailsPrint textonly
+ DetailPrint " "
+ SetDetailsPrint listonly
+
+ Pop ${L_TEMP}
+
+ !undef L_TEMP
+
+ SectionEnd
+
+ #--------------------------------------------------------------------------
# Uninstaller Section: 'un.Minimal Perl'
#--------------------------------------------------------------------------
Index: WriteEnvStr.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -C2 -d -r1.12.4.3 -r1.12.4.4
*** WriteEnvStr.nsh 6 Feb 2006 16:59:16 -0000 1.12.4.3
--- WriteEnvStr.nsh 5 Oct 2007 18:36:52 -0000 1.12.4.4
***************
*** 5,9 ****
# 'Kakasi' package.
#
! # Copyright (c) 2003-2005 John Graham-Cumming
#
# This file is part of POPFile
--- 5,9 ----
# 'Kakasi' package.
#
! # Copyright (c) 2003-2007 John Graham-Cumming
#
# This file is part of POPFile
***************
*** 41,45 ****
!endif
! !ifndef ADDUSER & NO_KAKASI
#--------------------------------------------------------------------------
# Installer Function: PFI_WriteEnv
--- 41,45 ----
!endif
! !ifndef ADDUSER
#--------------------------------------------------------------------------
# Installer Function: PFI_WriteEnv
--- NEW FILE: ioP.ini ---
#-------------------------------------------------------------------
#
# ioP.ini --- This file is used by "installer.nsi", one of the NSIS scripts
# used to create the Windows installer for POPFile. This file
# defines the layout of the custom page used to select the
# parser to be used when processing Japanese text.
#
# Copyright (c) 2007 John Graham-Cumming
#
# This file is part of POPFile
#
# POPFile is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# POPFile is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with POPFile; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#-------------------------------------------------------------------
[Settings]
NumFields=6
[Field 1]
Type=radiobutton
Text=
Left=0
Right=-1
Top=0
Bottom=10
State=1
Flags=NOTIFY
[Field 2]
Type=radiobutton
Text=
Left=0
Right=-1
Top=11
Bottom=21
State=0
Flags=NOTIFY
[Field 3]
Type=radiobutton
Text=
Left=0
Right=-1
Top=22
Bottom=32
State=0
Flags=NOTIFY
[Field 4]
Type=text
State=
Left=0
Right=-1
Top=34
Bottom=79
Flags=READONLY|MULTILINE
[Field 5]
Type=label
Text=
Left=0
Right=-1
Top=81
Bottom=129
[Field 6]
Type=link
Text=
Left=0
Right=-1
Top=130
Bottom=140
#--------------------
# End of ioP.ini
#--------------------
|
