Menu
▾
▴
[popfile-commit] windows installer.nsi,1.116,1.117
|
From: <xue...@us...> - 2003-10-01 16:59:36
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv24091
Modified Files:
installer.nsi
Log Message:
'Encode' is no longer required by non-Japanese users, ENGLISH_ONLY replaced by less ambiguous ENGLISH_MODE.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** installer.nsi 30 Sep 2003 00:39:13 -0000 1.116
--- installer.nsi 1 Oct 2003 16:59:30 -0000 1.117
***************
*** 53,57 ****
#
# Normal multi-language build command: makensis.exe installer.nsi
! # To build an English-only installer: makensis.exe /DENGLISH_ONLY installer.nsi
#
#--------------------------------------------------------------------------
--- 53,57 ----
#
# Normal multi-language build command: makensis.exe installer.nsi
! # To build an English-only installer: makensis.exe /DENGLISH_MODE installer.nsi
#
#--------------------------------------------------------------------------
***************
*** 115,119 ****
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (CVS KAKASI)"
!define C_README "v0.20.0.change"
--- 115,119 ----
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (INVISIBLE KAKASI)"
!define C_README "v0.20.0.change"
***************
*** 193,200 ****
VIAddVersionKey "FileVersion" "${MUI_VERSION}"
! !ifndef ENGLISH_ONLY
! VIAddVersionKey "Build" "Multi-Language (CVS KAKASI)"
!else
! VIAddVersionKey "Build" "English-Only (CVS KAKASI)"
!endif
--- 193,200 ----
VIAddVersionKey "FileVersion" "${MUI_VERSION}"
! !ifndef ENGLISH_MODE
! VIAddVersionKey "Build" "Multi-Language"
!else
! VIAddVersionKey "Build" "English-Mode"
!endif
***************
*** 403,414 ****
!insertmacro PFI_LANG_LOAD "English"
! ; Conditional compilation: if ENGLISH_ONLY is defined, support only 'English'
! !ifndef ENGLISH_ONLY
; Additional languages supported by the installer.
; To remove a language, comment-out the relevant '!insertmacro PFI_LANG_LOAD' line
! ; from this list. (To remove all of these languages, use /DENGLISH_ONLY on command-line)
; Entries will appear in the drop-down list of languages in the order given below
--- 403,414 ----
!insertmacro PFI_LANG_LOAD "English"
! ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English'
! !ifndef ENGLISH_MODE
; Additional languages supported by the installer.
; To remove a language, comment-out the relevant '!insertmacro PFI_LANG_LOAD' line
! ; from this list. (To remove all of these languages, use /DENGLISH_MODE on command-line)
; Entries will appear in the drop-down list of languages in the order given below
***************
*** 488,494 ****
Push ${L_LINE}
! ; Conditional compilation: if ENGLISH_ONLY is defined, support only 'English'
! !ifndef ENGLISH_ONLY
!insertmacro MUI_LANGDLL_DISPLAY
!endif
--- 488,494 ----
Push ${L_LINE}
! ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English'
! !ifndef ENGLISH_MODE
!insertmacro MUI_LANGDLL_DISPLAY
!endif
***************
*** 572,575 ****
--- 572,579 ----
Call StartPOPFilePage_Init
+ ; Ensure the 'Kakasi' section is selected if 'Japanese' has been chosen
+
+ Call HandleKakasi
+
FunctionEnd
***************
*** 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
--- 711,714 ----
***************
*** 745,753 ****
File "${C_PERL_DIR}\bin\perl58.dll"
File "${C_PERL_DIR}\lib\AutoLoader.pm"
- File "${C_PERL_DIR}\lib\base.pm"
File "${C_PERL_DIR}\lib\Carp.pm"
File "${C_PERL_DIR}\lib\Config.pm"
File "${C_PERL_DIR}\lib\DynaLoader.pm"
- File "${C_PERL_DIR}\lib\Encode.pm"
File "${C_PERL_DIR}\lib\Errno.pm"
File "${C_PERL_DIR}\lib\Exporter.pm"
--- 721,727 ----
***************
*** 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\*"
--- 741,744 ----
***************
*** 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
--- 761,764 ----
***************
*** 827,845 ****
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
File "${C_PERL_DIR}\lib\auto\File\Glob\*"
--- 774,777 ----
***************
*** 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\*"
--- 794,797 ----
***************
*** 1017,1024 ****
File "..\engine\languages\*.msg"
! ; Conditional compilation: if ENGLISH_ONLY is defined, installer supports only 'English'
; so there is no need to select a language for the POPFile UI
! !ifndef ENGLISH_ONLY
; UI_LANG_CONFIG parameters: "NSIS Language name" "POPFile UI language name"
--- 938,945 ----
File "..\engine\languages\*.msg"
! ; Conditional compilation: if ENGLISH_MODE is defined, installer supports only 'English'
; so there is no need to select a language for the POPFile UI
! !ifndef ENGLISH_MODE
; UI_LANG_CONFIG parameters: "NSIS Language name" "POPFile UI language name"
***************
*** 1074,1077 ****
--- 995,1047 ----
#--------------------------------------------------------------------------
+ # Installer Section: (optional) Kakasi component
+ #
+ # This component is automatically installed if 'Japanese' has been selected
+ # as the language for the installer. Normally this component is not seen in
+ # the 'Components' list, but if an English-mode installer is built this
+ # component will be made visible to allow it to be selected by the user.
+ #--------------------------------------------------------------------------
+
+ Section "Kakasi" SecKakasi
+
+ ;--------------------------------------------------------------------------
+ ; 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
+
+ ;--------------------------------------------------------------------------
+ ; Install Perl modules: base.pm, the Encode collection and Text::Kakasi
+ ;--------------------------------------------------------------------------
+
+ SetOutPath $INSTDIR
+ File "${C_PERL_DIR}\lib\base.pm"
+ File "${C_PERL_DIR}\lib\Encode.pm"
+
+ SetOutPath $INSTDIR\Encode
+ File /r "${C_PERL_DIR}\lib\Encode\*"
+
+ SetOutPath $INSTDIR\auto\Encode
+ File /r "${C_PERL_DIR}\lib\auto\Encode\*"
+
+ SetOutPath $INSTDIR\Text
+ File "${C_PERL_DIR}\lib\Text\Kakasi.pm"
+
+ SetOutPath $INSTDIR\auto\Text\Kakasi
+ File "${C_PERL_DIR}\lib\auto\Text\Kakasi\*"
+
+ SectionEnd
+
+ #--------------------------------------------------------------------------
# Component-selection page descriptions
#--------------------------------------------------------------------------
***************
*** 1081,1087 ****
--- 1051,1081 ----
!insertmacro MUI_DESCRIPTION_TEXT ${SecSkins} $(DESC_SecSkins)
!insertmacro MUI_DESCRIPTION_TEXT ${SecLangs} $(DESC_SecLangs)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecKakasi} "Kakasi"
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
#--------------------------------------------------------------------------
+ # Installer Function: HandleKakasi
+ #
+ # This function ensures that when 'Japanese' has been selected as the language
+ # for the installer, the 'Kakasi' section is invisibly selected for installation
+ # (if any other language is selected, we do not select the invisible 'Kakasi' section).
+ #
+ # If the installer is built in ENGLISH_MODE then the 'Kakasi' section will be visible
+ # to allow it to be selected if it is required.
+ #--------------------------------------------------------------------------
+
+ Function HandleKakasi
+
+ !insertmacro UnselectSection ${SecKakasi}
+
+ !ifndef ENGLISH_MODE
+ SectionSetText ${SecKakasi} "" ; this makes the component invisible
+ StrCmp $LANGUAGE ${LANG_JAPANESE} 0 exit
+ !insertmacro SelectSection ${SecKakasi}
+ exit:
+ !endif
+ FunctionEnd
+
+ #--------------------------------------------------------------------------
# Installer Function: MakeItSafe
#
***************
*** 2175,2179 ****
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
--- 2169,2173 ----
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
|
