anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: adapt update process to work with recent MiKTeX

Browse Source 
- finally the installer should result in a fully functional LyX, no matter when users installed MiKTeX or updated it the last time (or never)
This commit is contained in:
Uwe Stöhr 2018-03-08 22:35:38 +01:00
parent 6659304f7f
commit 848462a139
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/Win32/packaging/installer/ChangeLog.txt
View File

@ -1,8 +1,8 @@
Changelog for LyX-230-1: Changelog for LyX-230-4:
- installs LyX 2.3.0 - installs LyX 2.3.0
- fix installation of Arabic spell checker - fix installation of Arabic spell checker
- updated to MiKTeX 2.9 build 6615 - updated to MiKTeX 2.9 build 6615
- updated to ImageMagick 7.0.7-24 - updated to ImageMagick 7.0.7-25
- new thesaurus for Arabic - new thesaurus for Arabic
- updated thesaurus for Ukrainian - updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian - updated spell checker dictionaries for Arabic, Breton and Ukrainian

10
development/Win32/packaging/installer/include/LaTeX.nsh
View File

@ -395,6 +395,8 @@ Function UpdateMiKTeX
# handling might fail and users cannot use LaTeX at all afterwards - they then # handling might fail and users cannot use LaTeX at all afterwards - they then
# would have no other choice than to reinstall MiKTeX # would have no other choice than to reinstall MiKTeX
# This case is fixed by forcing the restoration of the internal links # This case is fixed by forcing the restoration of the internal links
# There is another issue: the MiKTeX update program needs to be replaced by
# the new MiKTeX console. This is a 3-step process.
#MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES UpdateNow IDNO UpdateLater #MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES UpdateNow IDNO UpdateLater
#UpdateNow: #UpdateNow:
# graphical update: # graphical update:
@ -419,9 +421,17 @@ Function UpdateMiKTeX
${if} $MultiUser.Privileges != "Admin" ${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power" ${andif} $MultiUser.Privileges != "Power"
# call the non-admin version # call the non-admin version
# the order of the different commands is important!
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"' nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${else} ${else}
${if} $MiKTeXUser != "HKCU" # call the admin version ${if} $MiKTeXUser != "HKCU" # call the admin version
# the order of the different commands is important!
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update=miktex-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--install=miktex-console-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--uninstall=miktex-mpm-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"' nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
${else} ${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"' nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'

2
development/Win32/packaging/installer/settings.nsh
View File

@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 0 !define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise "" !define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version !define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display