commit 9f9450cacdbbfa06f6234d733d01b7e563858b88
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Mar 11 02:59:08 2018 +0100
Win installer: respect also 64bit MiKTeX
---
.../Win32/packaging/installer/ChangeLog.txt | 2 +-
.../Win32/packaging/installer/include/LaTeX.nsh | 35 ++++++++++++++++----
development/Win32/packaging/installer/settings.nsh | 2 +-
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index d42a6cb..d0ef0de 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -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
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index ab6775f..a9e29f8 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -422,19 +422,40 @@ Function UpdateMiKTeX
${andif} $MultiUser.Privileges != "Power"
# 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"'
+ ${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!
- 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"'
+ ${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}
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
+ ${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}
# restore possibly broken internal MiKTeX links after the update
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 87fb2a0..933d2ab 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -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
