commit 0cbde8a8342bf55d431133b7acdfe88b655492f0
Author: Richard Kimberly Heck <[email protected]>
Date: Fri Sep 28 21:50:25 2018 -0400
Windows packaging updates.
The main change here is that we need to delete LyX2.3.exe and
tex2lyx2.3.exe from the install directory, so they are not left
there (from previous, versioned installs).
---
.../Win32/packaging/installer/lang/english.nsh | 4 ++--
development/Win32/packaging/installer/settings.nsh | 2 +-
.../Win32/packaging/installer/setup/install.nsh | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/development/Win32/packaging/installer/lang/english.nsh
b/development/Win32/packaging/installer/lang/english.nsh
index df44ed0..91e3058 100644
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -85,8 +85,8 @@ ${LangFileString} ModifyingConfigureFailed "Could not set
'path_prefix' in the c
#${LangFileString} RunConfigureFailed "Could not execute the configure script"
${LangFileString} InstallRunning "The installer is already running!"
${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is already
installed!$\r$\n\
- Installing over existing installations is not
recommended if the installed version$\r$\n\
- is a test release or if you have problems with
your existing LyX installation.$\r$\n\
+ Installing over existing installations is not
recommended if the installed version\
+ is a test release or if you have problems with
your existing LyX installation.\
In these cases better reinstall LyX.$\r$\n\
Do you nevertheless want to install LyX over
the existing version?"
${LangFileString} NewerInstalled "You are trying to install an older version
of LyX than what you have installed.$\r$\n\
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 0dc43c7..175b664 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 1
!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 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
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index ad814e3..53196e3 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -44,6 +44,10 @@ Section -ProgramFiles SecProgramFiles
# Binaries
SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
+ # The 2.3.0 and early 2.3.1 installers used a version suffix
+ # We need to remove the old binaries if we're installing into the same
directory
+ Delete "$INSTDIR\bin\LyX2.3.exe"
+ Delete "$INSTDIR\bin\tex2lyx2.3.exe"
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
!insertmacro FileListMinGW File "${FILES_LYX}\bin\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
@@ -126,7 +130,6 @@ Section -ProgramFiles SecProgramFiles
!insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
# install the LaTeX class files that are delivered with LyX to MiKTeX
- # and enable MiKTeX's automatic package installation
${if} $LaTeXInstalled == "MiKTeX"
Call ConfigureMiKTeX # Function from LaTeX.nsh
${endif}
