commit dba70d6ee9447e72df45e629164531faa47962e2
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue Jan 13 01:28:07 2015 +0100
installer: configure.nsh: better babel installation
The former solution with installing all babel packages at once via a list
fails if only a single package of the list is already installed. In this case
none of the packages in the installation list will be installed. Therefore
every package will be installed separately.
(The bug is already reported to MiKTeX and this workaround can be removed
for LyX 2.1.4.))
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index a26bcbe..bd8df88 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -216,8 +216,9 @@ Section -ConfigureScript
${if} $LaTeXInstalled == "MiKTeX"
Call UpdateMiKTeX # function from latex.nsh
# install all necessary packages at once because this is much faster then
to install the packages one by one
- # NOTE: the babelpackages-txt list is only necessary for LyX 2.1.2 ans
2.1.3 because of the restructuration
+ # NOTE: the babel packages installation is only necessary for LyX 2.1.2 ans
2.1.3 because of the restructuration
# of babel in MiKTeX. This can be removed for LyX 2.1.4
+ # (due to a missing feature in MiKTeX each babel package has to be
installed separately)
DetailPrint $(TEXT_CONFIGURE_LYX)
${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
@@ -225,16 +226,151 @@ Section -ConfigureScript
# at first we need to synchronize the package database
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\babel-Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-albanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-bahasa"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-basque"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-breton"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-bulgarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-catalan"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-croatian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-czech"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-danish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-dutch"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-english"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-esperanto"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-estonian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-finnish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-french"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-galician"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-german"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-greek"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-hebrew"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-hungarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-icelandic"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-interlingua"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-irish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-italian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-kurmanji"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-latin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-latvian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-norsk"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-polish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-portuges"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-romanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-russian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-samin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-scottish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-serbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-serbianc"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-slovak"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-slovenian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-sorbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-spanish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-swedish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install=babel-thai"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-turkish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-ukrainian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-vietnamese"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-welsh"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\babel-Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-albanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-bahasa"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-basque"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-breton"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-bulgarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-catalan"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-croatian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-czech"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-danish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-dutch"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-english"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-esperanto"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-estonian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-finnish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-french"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-galician"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-german"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-greek"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-hebrew"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-hungarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-icelandic"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-interlingua"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-irish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-italian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-kurmanji"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-latin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-latvian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-norsk"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-polish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-portuges"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-romanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-russian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-samin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-scottish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-serbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-serbianc"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-slovak"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-slovenian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-sorbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-spanish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-swedish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-thai"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-turkish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-ukrainian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-vietnamese"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install=babel-welsh"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\babel-Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-albanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-bahasa"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-basque"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-breton"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-bulgarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-catalan"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-croatian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-czech"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-danish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-dutch"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-english"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-esperanto"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-estonian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-finnish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-french"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-galician"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-german"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-greek"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-hebrew"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-hungarian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-icelandic"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-interlingua"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-irish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-italian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-kurmanji"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-latin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-latvian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-norsk"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-polish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-portuges"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-romanian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-russian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-samin"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-scottish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-serbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-serbianc"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-slovak"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-slovenian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-sorbian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-spanish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-swedish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-thai"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-turkish"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-ukrainian"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-vietnamese"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install=babel-welsh"'
${endif}
${endif}
${endif}
