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).

(cherry picked from commit 0cbde8a8342bf55d431133b7acdfe88b655492f0)

diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh
index 89e4afc95ca667da7bbd2376e5febc5375d5ac43..ff3e5794778fbf37fb43793eceaa05e3462f5c7f 100644 (file)
--- 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/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 15bc2758548d39f755c98333c486415571d93174..36013295280b34c967d1cee0f2fa21fcebde528f 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -46,6 +46,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 FileListMSVC File "${FILES_MSVC}\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
@@ -138,7 +142,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}