commit 3419fa6a9e0ff3542c8118a34eab67593bd8d895
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 06:11:11 2018 +0100
Win installer: MiKTeX has a new maintenance program
- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2hours every day
---
.../Win32/packaging/installer/ChangeLog.txt | 1 +
development/Win32/packaging/installer/Packages.txt | 6 ++++++
development/Win32/packaging/installer/settings.nsh | 4 ++--
.../Win32/packaging/installer/setup/configure.nsh | 6 +++---
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 4bf75a8..61cd73d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,7 @@
Changelog for LyX-230-1:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
+- updated to MiKTeX 2.9 build 6615
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index ff8029f..0d94fc7 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,13 +45,13 @@ These typically need to be modified for each LyX release
#--------------------------------
# MiKTeX and JabRef
-!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
+!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 8058507..3de31b3 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -245,14 +245,14 @@ Section -ConfigureScript
# call the non-admin version
# 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"
"--require=@$INSTDIR\Resources\Packages.txt"'
${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"
"--require=@$INSTDIR\Resources\Packages.txt"'
${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"
"--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
${endif}
