From 52ec886d5b3681e3f7364ded9ae1431ac1eadb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 17 Nov 2010 05:54:30 +0000 Subject: [PATCH] installer: - support for Serbian as LyX menu language - support for MiKTeX 2.9 - preparation for beta1 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36336 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../packaging/AltInstaller/ChangeLog.txt | 8 +++--- .../Win32/packaging/AltInstaller/LaTeX.nsh | 26 +++++++++---------- .../AltInstaller/LanguageSettings.nsh | 9 ++++++- .../AltInstaller/MissingPrograms.nsh | 3 +++ .../packaging/AltInstaller/io_ui_language.ini | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt index 82888b9186..2a78966682 100644 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt @@ -1,7 +1,9 @@ Version 5.7 -- LyX 2.0svn (October 3, 2010) -- updated to eLyXer 1.0.3 -- updated to ImageMagick 6.6.5-y +- LyX 2.0beta1 +- updated to eLyXer 1.0.4 +- updated to ImageMagick 6.6.5-8 +- updated to MiKTeX 2.9 (build 3972) +- support to set Serbian (Latin) as LyX menu language (new feature in LyX) Version 5.6 diff --git a/development/Win32/packaging/AltInstaller/LaTeX.nsh b/development/Win32/packaging/AltInstaller/LaTeX.nsh index 991a88170c..238e19e9ff 100644 --- a/development/Win32/packaging/AltInstaller/LaTeX.nsh +++ b/development/Win32/packaging/AltInstaller/LaTeX.nsh @@ -8,7 +8,7 @@ Function LaTeXActions Call LaTeXCheck # sets the path to the latex.exe to $LatexPath # Function from LyXUtils.nsh ${if} $LatexPath != "" - # check if MiKTeX 2.6 or newer is installed + # check if MiKTeX 2.7 or newer is installed StrCpy $0 0 loopA: EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey @@ -17,10 +17,6 @@ Function LaTeXActions IntOp $0 $0 + 1 Goto loopA doneA: - ${if} $String == "2.6" - StrCpy $MiKTeXVersion "2.6" - StrCpy $LaTeXName "MiKTeX 2.6" - ${endif} ${if} $String == "2.7" StrCpy $MiKTeXVersion "2.7" StrCpy $LaTeXName "MiKTeX 2.7" @@ -29,6 +25,10 @@ Function LaTeXActions StrCpy $MiKTeXVersion "2.8" StrCpy $LaTeXName "MiKTeX 2.8" ${endif} + ${if} $String == "2.9" + StrCpy $MiKTeXVersion "2.9" + StrCpy $LaTeXName "MiKTeX 2.9" + ${endif} ${endif} ${if} $LatexPath == "" # check if MiKTeX is installed only for the current user @@ -48,10 +48,6 @@ Function LaTeXActions IntOp $0 $0 + 1 Goto loopB doneB: - ${if} $String == "2.6" - StrCpy $MiKTeXVersion "2.6" - StrCpy $LaTeXName "MiKTeX 2.6" - ${endif} ${if} $String == "2.7" StrCpy $MiKTeXVersion "2.7" StrCpy $LaTeXName "MiKTeX 2.7" @@ -60,6 +56,10 @@ Function LaTeXActions StrCpy $MiKTeXVersion "2.8" StrCpy $LaTeXName "MiKTeX 2.8" ${endif} + ${if} $String == "2.9" + StrCpy $MiKTeXVersion "2.9" + StrCpy $LaTeXName "MiKTeX 2.9" + ${endif} ${endif} ${if} $LatexPath != "" @@ -94,9 +94,9 @@ Function LaTeXActions ${endif} ${endif} ${if} $LatexPath != "" - ${andif} $LaTeXName != "MiKTeX 2.6" ${andif} $LaTeXName != "MiKTeX 2.7" ${andif} $LaTeXName != "MiKTeX 2.8" + ${andif} $LaTeXName != "MiKTeX 2.9" StrCpy $LaTeXName "TeXLive" ${endif} @@ -221,10 +221,8 @@ Function UpdateMiKTeX MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater UpdateNow: StrCpy $0 $LaTeXPath -4 # remove "\bin" - # the update wizard is either started by the copystart.exe or the copystart_admin.exe - # (the latter replaces copystart.exe since miktex-2.6.2742) or the miktex-update.exe - # (since MiKTeX 2.8) - ExecWait '"$LaTeXPath\copystart.exe" "$0\config\update.dat"' # run MiKTeX's update wizard + # the update wizard is either started by the copystart_admin.exe + # or the miktex-update.exe (since MiKTeX 2.8) ExecWait '"$LaTeXPath\copystart_admin.exe" "$0\config\update.dat"' # run MiKTeX's update wizard ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin ExecWait '"$LaTeXPath\internal\miktex-update_admin.exe"' # run MiKTeX's update wizard diff --git a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh index 527583175d..6c4a536c18 100644 --- a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh +++ b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh @@ -399,8 +399,9 @@ ${endif} ${if} ${LangISOCode} = 2074 + StrCpy ${LangNme} "Srpski (Latinica)" StrCpy ${LangCdeSys} "sr" - StrCpy ${LangNmeSys} "Srpski" + StrCpy ${LangNmeSys} "Srpski (Latinica)" StrCpy ${LangSysEnc} "1250" ${endif} @@ -680,6 +681,12 @@ StrCpy ${LangEnc} "cp-1251" ${endif} + ${if} ${Name} == "Srpski (Latinica)" + StrCpy ${LangCde} "sr_RS" + StrCpy ${LangNmeLyX} "serbian-latin" + StrCpy ${LangEnc} "cp-1250" + ${endif} + ${if} ${Name} == "Slovenskı" StrCpy ${LangCde} "sk_SK" StrCpy ${LangNmeLyX} "slovak" diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh index 31e1c5d6a8..8746ac3cb6 100644 --- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh +++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh @@ -91,6 +91,9 @@ Function MissingPrograms ${if} $PythonPath == "" ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" ${endif} + ${if} $PythonPath == "" + ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" "" + ${endif} ${if} $PythonPath == "" ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" "" ${endif} diff --git a/development/Win32/packaging/AltInstaller/io_ui_language.ini b/development/Win32/packaging/AltInstaller/io_ui_language.ini index d9f17f0a35..548b6b239f 100644 --- a/development/Win32/packaging/AltInstaller/io_ui_language.ini +++ b/development/Win32/packaging/AltInstaller/io_ui_language.ini @@ -11,7 +11,7 @@ Text=" Available Languages " [Field 2] Type=Droplist -ListItems=Arabic|Bahasa Indonesia|Català|Ceština|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Greek|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Português|Româna|Russian|Slovenskı|Slovenšcina|Suomi|Türkçe|Ukrainian +ListItems=Arabic|Bahasa Indonesia|Català|Ceština|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Greek|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Português|Româna|Russian|Slovenskı|Slovenšcina|Srpski (Latinica)|Suomi|Türkçe|Ukrainian Left=20 Right=130 Top=15