[popfile-commit] windows installer.nsi,1.115,1.116

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv25930

Modified Files:
	installer.nsi 
Log Message:
Revised to install the Kakasi package and the full Perl Encode collection.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** installer.nsi	23 Sep 2003 21:14:14 -0000	1.115
--- installer.nsi	30 Sep 2003 00:39:13 -0000	1.116
***************
*** 99,102 ****
--- 99,112 ----
  # 'Languages' component to allow the installer to select the appropriate UI language.
  #--------------------------------------------------------------------------
+ # Support for Japanese text processing
+ #
+ # This version of the installer installs the Kakasi package and the Text::Kakasi Perl module
+ # used by POPFile when processing Japanese text. Further information about Kakasi, including
+ # 'download' links for the Kakasi package and the Text::Kakasi Perl module, can be found at
+ # http://kakasi.namazu.org/
+ #
+ # This version of the installer also installs the complete Perl 'Encode' collection of modules
+ # to complete the Japanese support requirements.
+ #--------------------------------------------------------------------------
  
    ;--------------------------------------------------------------------------
***************
*** 105,109 ****
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0 (CVS DB-EXE)"
  
    !define C_README        "v0.20.0.change"
--- 115,119 ----
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0 (CVS KAKASI)"
  
    !define C_README        "v0.20.0.change"
***************
*** 116,119 ****
--- 126,143 ----
    !define C_PERL_DIR      "C:\Perl"
  
+   ;----------------------------------------------------------------------------------
+   ; Root directory for the Kakasi package.
+   ;
+   ; The Kakasi package is distributed as a ZIP file which contains several folders
+   ; (bin, doc, include, lib and share) all of which are under a top level folder
+   ; called 'kakasi'. 'C_KAKASI_DIR' is used to refer to the folder into which the
+   ; Kakasi ZIP file has been unzipped.
+   ;
+   ; The 'itaijidict' file's path should be '${C_KAKASI_DIR}\kakasi\share\kakasi\itaijidict'
+   ; The 'kanwadict'  file's path should be '${C_KAKASI_DIR}\kakasi\share\kakasi\kanwadict'
+   ;----------------------------------------------------------------------------------
+ 
+   !define C_KAKASI_DIR      "kakasi_package"
+ 
    ;--------------------------------------------------------------------------------
    ; Constants for the timeout loop used after issuing a POPFile 'shutdown' request
***************
*** 170,176 ****
  
    !ifndef ENGLISH_ONLY
!     VIAddVersionKey "Build" "Multi-Language (CVS DB-EXE)"
    !else
!     VIAddVersionKey "Build" "English-Only (CVS DB-EXE)"
    !endif
  
--- 194,200 ----
  
    !ifndef ENGLISH_ONLY
!     VIAddVersionKey "Build" "Multi-Language (CVS KAKASI)"
    !else
!     VIAddVersionKey "Build" "English-Only (CVS KAKASI)"
    !endif
  
***************
*** 206,209 ****
--- 230,234 ----
  
    !include pfi-library.nsh
+   !include WriteEnvStr.nsh
  
  #--------------------------------------------------------------------------
***************
*** 682,685 ****
--- 707,738 ----
    File "..\engine\languages\English.msg"
  
+   !ifndef ENGLISH_ONLY
+           StrCmp $LANGUAGE ${LANG_JAPANESE} 0 skip_kakasi_install
+   !endif
+ 
+   ;--------------------------------------------------------------------------
+   ; Install Kakasi package
+   ;--------------------------------------------------------------------------
+ 
+   SetOutPath $INSTDIR
+   File /r "${C_KAKASI_DIR}\kakasi"
+ 
+   ; Add Environment Variables for Kakasi
+ 
+   Push ITAIJIDICTPATH
+   Push $INSTDIR\kakasi\share\kakasi\itaijidict
+   Call WriteEnvStr
+   Push KANWADICTPATH
+   Push $INSTDIR\kakasi\share\kakasi\kanwadict
+   Call WriteEnvStr
+ 
+   ;--------------------------------------------------------------------------
+   ; End of Kakasi installation
+   ;--------------------------------------------------------------------------
+   
+   !ifndef ENGLISH_ONLY
+       skip_kakasi_install:
+   !endif
+ 
    ; Install the Minimal Perl files
  
***************
*** 714,722 ****
    File "${C_PERL_DIR}\lib\Carp\*"
  
    SetOutPath $INSTDIR\Encode
!   File "${C_PERL_DIR}\lib\Encode\Alias.pm"
!   File "${C_PERL_DIR}\lib\Encode\Config.pm"
!   File "${C_PERL_DIR}\lib\Encode\Encoding.pm"
  
    SetOutPath $INSTDIR\Exporter
    File "${C_PERL_DIR}\lib\Exporter\*"
--- 767,787 ----
    File "${C_PERL_DIR}\lib\Carp\*"
  
+   !ifndef ENGLISH_ONLY
+           StrCmp $LANGUAGE ${LANG_JAPANESE} full_encode
+           SetOutPath $INSTDIR\Encode
+           File "${C_PERL_DIR}\lib\Encode\Alias.pm"
+           File "${C_PERL_DIR}\lib\Encode\Config.pm"
+           File "${C_PERL_DIR}\lib\Encode\Encoding.pm"
+           Goto encode_done
+       full_encode:
+   !endif
+ 
    SetOutPath $INSTDIR\Encode
!   File /r "${C_PERL_DIR}\lib\Encode\*"
  
+   !ifndef ENGLISH_ONLY
+       encode_done:
+   !endif
+   
    SetOutPath $INSTDIR\Exporter
    File "${C_PERL_DIR}\lib\Exporter\*"
***************
*** 739,742 ****
--- 804,817 ----
    SetOutPath $INSTDIR\Text
    File "${C_PERL_DIR}\lib\Text\ParseWords.pm"
+   
+  !ifndef ENGLISH_ONLY
+           StrCmp $LANGUAGE ${LANG_JAPANESE} 0 skip_text_kakasi
+   !endif
+   
+     File "${C_PERL_DIR}\lib\Text\Kakasi.pm"
+     
+  !ifndef ENGLISH_ONLY
+       skip_text_kakasi:
+  !endif
  
    SetOutPath $INSTDIR\warnings
***************
*** 752,757 ****
    File "${C_PERL_DIR}\lib\auto\DynaLoader\*"
  
    SetOutPath $INSTDIR\auto\Encode
!   File "${C_PERL_DIR}\lib\auto\Encode\*"
  
    SetOutPath $INSTDIR\auto\File\Glob
--- 827,844 ----
    File "${C_PERL_DIR}\lib\auto\DynaLoader\*"
  
+   !ifndef ENGLISH_ONLY
+           StrCmp $LANGUAGE ${LANG_JAPANESE} full_auto_encode
+           SetOutPath $INSTDIR\auto\Encode
+           File "${C_PERL_DIR}\lib\auto\Encode\*"
+           Goto auto_encode_done
+       full_auto_encode:
+   !endif
+ 
    SetOutPath $INSTDIR\auto\Encode
!   File /r "${C_PERL_DIR}\lib\auto\Encode\*"
! 
!   !ifndef ENGLISH_ONLY
!       auto_encode_done:
!   !endif
  
    SetOutPath $INSTDIR\auto\File\Glob
***************
*** 775,778 ****
--- 862,876 ----
    File "${C_PERL_DIR}\lib\auto\Sys\Hostname\*"
  
+  !ifndef ENGLISH_ONLY
+           StrCmp $LANGUAGE ${LANG_JAPANESE} 0 skip_auto_text_kakasi
+   !endif
+ 
+   SetOutPath $INSTDIR\auto\Text\Kakasi
+   File "${C_PERL_DIR}\lib\auto\Text\Kakasi\*"
+ 
+   !ifndef ENGLISH_ONLY
+       skip_auto_text_kakasi:
+   !endif
+ 
    SetOutPath $INSTDIR\auto\Win32\API
    File "${C_PERL_DIR}\site\lib\auto\Win32\API\*"
***************
*** 1865,1868 ****
--- 1963,1982 ----
    FileClose ${L_CFG}
  
+   IfRebootFlag 0 page_enabled
+ 
+   ; We are running on a Win9x system which must be rebooted before Kakasi can be used,
+   ; so we are unable to offer to start POPFile at this point
+ 
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 2" "State" "1"
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 3" "State" "0"
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 4" "State" "0"
+ 
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 2" "Flags" "DISABLED"
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 3" "Flags" "DISABLED"
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Field 4" "Flags" "DISABLED"
+   Goto display_the_page
+ 
+ page_enabled:
+ 
    ; clear all three radio buttons ('do not start', 'use console', 'run in background')
  
***************
*** 2060,2063 ****
--- 2174,2188 ----
    Push ${L_TEMP}
  
+   IfRebootFlag 0 not_Win9x
+   
+   ; We are running on a Win9x system and must reboot before using POPFile
+   ; (replace previous page with a simple "Please wait" one, in case the page appears
+   ; again while the system is rebooting)
+ 
+   !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_OPTIONS_BANNER_1)" "$(PFI_LANG_OPTIONS_BANNER_2)"
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "NumFields" "0"
+   Goto selection_ok
+ 
+ not_Win9x:
    ; Enable the 'Run' CheckBox on the 'Finish' page (it may have been disabled on our last visit)
  
***************
*** 2296,2299 ****
--- 2421,2425 ----
  
    Delete "$SMPROGRAMS\${MUI_PRODUCT}\Support\POPFile Home Page.url"
+   Delete "$SMPROGRAMS\${MUI_PRODUCT}\Support\POPFile Manual.url"
    RMDir "$SMPROGRAMS\${MUI_PRODUCT}\Support"
  
***************
*** 2433,2436 ****
--- 2559,2579 ----
    Delete $INSTDIR\stopwords.bak
    Delete $INSTDIR\stopwords.default
+ 
+   ;----------------------------------
+   ; Delete Kakasi - start
+   ;----------------------------------
+ 
+   RMDir /r "$INSTDIR\kakasi"
+ 
+   ;Delete Environment Variables
+ 
+   Push KANWADICTPATH
+   Call un.DeleteEnvStr
+   Push ITAIJIDICTPATH
+   Call un.DeleteEnvStr
+ 
+   ;----------------------------------
+   ; Delete Kakasi - end
+   ;----------------------------------
  
    StrCmp ${L_UPGRADE} "yes" remove_perl