[popfile-commit] windows installer-SecPOPFile-body.nsh, 1.3.2.18, 1.3.2.19 installer.nsi, 1.242.4.22, 1.242.4.23

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

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

Modified Files:
      Tag: b0_22_2
	installer-SecPOPFile-body.nsh installer.nsi 
Log Message:
Simplify the handling of the optional Japanese translation of the
release notes and handle the new name for the Brazilian Portuguese
UI language file. Also removed some debug code which got left behind.

Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.18
retrieving revision 1.3.2.19
diff -C2 -d -r1.3.2.18 -r1.3.2.19
*** installer-SecPOPFile-body.nsh	11 Dec 2007 12:40:53 -0000	1.3.2.18
--- installer-SecPOPFile-body.nsh	5 Jan 2008 14:38:36 -0000	1.3.2.19
***************
*** 8,12 ****
  #                                   in a separate file (see 'installer-SecPOPFile-func.nsh')
  #
! # Copyright (c) 2005-2007 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 8,12 ----
  #                                   in a separate file (see 'installer-SecPOPFile-func.nsh')
  #
! # Copyright (c) 2005-2008 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 186,198 ****
  
    ; Some releases may have a Japanese translation of the release notes.
-   
-   Delete "$G_ROOTDIR\${C_README}"
-   
-   StrCmp $LANGUAGE ${LANG_JAPANESE} 0 English_release_notes
-   File /nonfatal "/oname=$G_ROOTDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
-   IfFileExists "$G_ROOTDIR\${C_README}" copy_txt_version
  
- English_release_notes:
    File "${C_RELEASE_NOTES}"
  
  copy_txt_version:
--- 186,193 ----
  
    ; Some releases may have a Japanese translation of the release notes.
  
    File "${C_RELEASE_NOTES}"
+   StrCmp $LANGUAGE ${LANG_JAPANESE} 0 copy_txt_version
+   File /nonfatal "/oname=$G_ROOTDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
  
  copy_txt_version:

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.22
retrieving revision 1.242.4.23
diff -C2 -d -r1.242.4.22 -r1.242.4.23
*** installer.nsi	11 Dec 2007 12:40:53 -0000	1.242.4.22
--- installer.nsi	5 Jan 2008 14:38:36 -0000	1.242.4.23
***************
*** 21,25 ****
  #                       (2) pfidiag.exe     (NSIS script: test\pfidiag.nsi)
  #
! # Copyright (c) 2002-2007 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 21,25 ----
  #                       (2) pfidiag.exe     (NSIS script: test\pfidiag.nsi)
  #
! # Copyright (c) 2002-2008 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 903,907 ****
    ReserveFile /nonfatal "${C_JAPANESE_RELEASE_NOTES}"
    ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf"
! ;  ReserveFile "SSL_pm.pat"     ; 0.22.5 does not need any SSL patches so there's no need for a built-in copy
  
  #--------------------------------------------------------------------------
--- 903,908 ----
    ReserveFile /nonfatal "${C_JAPANESE_RELEASE_NOTES}"
    ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf"
! 
! ;  ReserveFile "SSL_pm.pat"     ; 0.22.5 (and later releases) do not need any SSL patches (yet)
  
  #--------------------------------------------------------------------------
***************
*** 960,971 ****
  
  UAC_Elevate:
- ;  MessageBox MB_OK "Debug message (UAC_Elevate label in .onInit function)\
- ;      ${MB_NL}${MB_NL}\
- ;      Command-line = $CMDLINE\
- ;      ${MB_NL}${MB_NL}\
- ;      $$G_WINUSERNAME = $G_WINUSERNAME\
- ;      ${MB_NL}${MB_NL}\
- ;      $$G_WINUSERTYPE = $G_WINUSERTYPE"
- 
    UAC::RunElevated
    StrCmp 1223 ${L_UAC_0} UAC_ElevationAborted   ; Jump if UAC dialog was aborted by user
--- 961,964 ----
***************
*** 1012,1021 ****
    ; notes then the normal English version will be used.
  
-   StrCmp $LANGUAGE ${LANG_JAPANESE} 0 English_release_notes
-   File /nonfatal "/oname=$PLUGINSDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
-   IfFileExists "$PLUGINSDIR\${C_README}" make_txt_file
- 
- English_release_notes:
    File "/oname=$PLUGINSDIR\${C_README}" "${C_RELEASE_NOTES}"
  
  make_txt_file:
--- 1005,1011 ----
    ; notes then the normal English version will be used.
  
    File "/oname=$PLUGINSDIR\${C_README}" "${C_RELEASE_NOTES}"
+   StrCmp $LANGUAGE ${LANG_JAPANESE} 0 make_txt_file
+   File /nonfatal "/oname=$PLUGINSDIR\${C_README}" "${C_JAPANESE_RELEASE_NOTES}"
  
  make_txt_file:
***************
*** 1362,1365 ****
--- 1352,1360 ----
    File "..\engine\languages\*.msg"
  
+   ; The 1.1.0 release renamed the Brazilian Portuguese UI language file
+   ; so we need to remove any old versions of the file to avoid confusion
+ 
+   Delete "$G_ROOTDIR\languages\Portugues do Brasil.msg"
+ 
    SetDetailsPrint textonly
    DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)"