mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Win installer: respect also 64bit MiKTeX
This commit is contained in:
parent
d3c51876a9
commit
9f9450cacd
@ -1,4 +1,4 @@
|
||||
Changelog for LyX-230-4:
|
||||
Changelog for LyX-230-5:
|
||||
- installs LyX 2.3.0
|
||||
- fix installation of Arabic spell checker
|
||||
- updated to MiKTeX 2.9 build 6615
|
||||
|
@ -422,18 +422,39 @@ Function UpdateMiKTeX
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
# the order of the different commands is important!
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
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"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
# the order of the different commands is important!
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
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"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
|
||||
${else}
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
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"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
|
||||
${endif}
|
||||
${endif}
|
||||
|
@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
|
||||
!define APP_VERSION_REVISION 0
|
||||
!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_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
|
||||
!define APP_VERSION_BUILD 5 # 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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user