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 73704fede7c9498c8f485e322fe05005eb73a9ff..2a79525302be3d4e1bc0ebee0a567a9b5e02eba1 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -1,51 +1,52 @@
-/*\r
-\r
-Settings for LyX installer\r
-\r
-These typically need to be modified for each LyX release\r
-\r
-*/\r
-\r
-#--------------------------------\r
-# Version number\r
-\r
-!define APP_VERSION_MAJOR 1\r
-!define APP_VERSION_MINOR 6\r
-!define APP_VERSION_REVISION 0\r
-!define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version\r
-\r
-#--------------------------------\r
-# Installer file name\r
-\r
-# Typical names for the release are "LyX-1.5.4-1-Installer.exe" etc.\r
-\r
-!ifndef ExeFile\r
-  !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"\r
-!endif\r
-!ifndef BundleExeFile\r
-  !define /date BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Bundle.exe"\r
-!endif\r
-!ifndef MinimalExeFile\r
-  !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"\r
-!endif\r
-\r
-#--------------------------------\r
-# File names of component installers\r
-\r
-!define SETUPFILE_LATEX "basic-miktex.2.7.2960.exe"\r
-!define SETUPFILE_IMAGEMAGEMAGICK "ImageMagick-6.4.1-0-Q16-windows-dll.exe"\r
-!define SETUPFILE_GHOSTSCRIPT "gs861w32.exe"\r
-\r
-#--------------------------------\r
-# Download size of components (in KB)\r
-\r
-!define SIZE_DOWNLOAD_LATEX 78493\r
-!define SIZE_DOWNLOAD_IMAGEMAGICK 8565\r
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 12469\r
-\r
-#--------------------------------\r
-# Approximations of space required for components (in KB)\r
-\r
-!define SIZE_LATEX 225000\r
-!define SIZE_IMAGEMAGICK 34500\r
-!define SIZE_GHOSTSCRIPT 31500\r
+/*
+
+Settings for LyX installer
+
+These typically need to be modified for each LyX release
+
+*/
+
+#--------------------------------
+# Version number
+
+!define APP_VERSION_MAJOR 2
+!define APP_VERSION_MINOR 4
+!define APP_VERSION_REVISION 0
+!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 2020
+
+#--------------------------------
+# Installer file name
+
+# 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}-\
+  x${APP_VERSION_ACHITECHTURE}.exe"
+!endif
+
+#--------------------------------
+# File locations
+# !!! you need to adjust them to the folders in your Windows system !!!
+
+!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"
+
+#--------------------------------
+# MiKTeX and JabRef
+
+!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+
+!define ImageMagickVersion "7.0.10"