Wininstaller2: improved check if over installing

[lyx.git] / development / Win32 / packaging / installer / settings.nsh

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 0d94fc7fc7cd8fdb74c4152632a6adbade1c4b2d..2a79525302be3d4e1bc0ebee0a567a9b5e02eba1 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -10,48 +10,43 @@ These typically need to be modified for each LyX release
 # Version number
 
 !define APP_VERSION_MAJOR 2
-!define APP_VERSION_MINOR 3
+!define APP_VERSION_MINOR 4
 !define APP_VERSION_REVISION 0
-!define APP_VERSION_EMERGENCY "RC-2" # use "1" for an emergency release of LyX otherwise ""
+!define APP_VERSION_EMERGENCY "dev" # 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 1 # Start with 1 for the installer releases of each version
 
+# 32 or 64 bit, use build folder names and dependencies folder names containing "32" or "64" to use following constant in File locations declarations below
+!define APP_VERSION_ACHITECHTURE 32
+
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
-!define COPYRIGHT_YEAR 2018
+!define COPYRIGHT_YEAR 2020
 
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
 
 !ifndef ExeFile
-  !define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
-!endif
-!ifndef BundleExeFile
-  !define BundleExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Bundle-${APP_VERSION_BUILD}.exe"
+  !define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}-\
+  x${APP_VERSION_ACHITECHTURE}.exe"
 !endif
 
 #--------------------------------
 # File locations
 # !!! you need to adjust them to the folders in your Windows system !!!
 
-!define FILES_LYX "D:\LyXPackage2.3\LyX"
-!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.9.4\5.9.4\msvc2015"
+!define FILES_BASE "C:\lyx"
+!define FILES_GIT "${FILES_BASE}\master\development\Win32\packaging"
+!define FILES_LYX "${FILES_BASE}\masterbuild${APP_VERSION_ACHITECHTURE}\LYX_INSTALLED"
+!define FILES_DEPS "${FILES_BASE}\lyx-windows-deps-msvc2019_${APP_VERSION_ACHITECHTURE}"
+!define FILES_QT "${FILES_BASE}\masterbuild${APP_VERSION_ACHITECHTURE}\LYX_INSTALLED"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
-!define DVIPostFileDir "${FILES_DEPS}\tex"
 
 #--------------------------------
 # MiKTeX and JabRef
 
 !define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
-!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "7.0.7"
- 
-# definitions for the Complete installer
-!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
-!endif
-
+!define ImageMagickVersion "7.0.10"