Win installer: push the changes that are already part of the 2.2.0 installer

[lyx.git] / development / Win32 / packaging / installer / include / declarations.nsh

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index a53d0a26ebb9db2eeb9875a21814f1beb655fcde..554aef8c393eb116170093e3d56676ae641decda 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -6,19 +6,21 @@ Configuration of LyX installer
 
 */
 
-SetCompressor /SOLID lzma
-
 #--------------------------------
 # File locations
 
 !define FILES_LICENSE "license.rtf"
-!define FILES_ICONS "..\icons"
+!define FILES_ICONS "icons"
 !define FILES_PDFVIEW "${FILES_DEPS}\bin"
 !define FILES_MSVC "${FILES_DEPS}\bin"
-!define FILES_PYTHON "${FILES_DEPS}\python"
+!define FILES_PERL "${FILES_DEPS}\Perl"
+!define FILES_PYTHON "${FILES_DEPS}\Python"
+!define FILES_ELYXER "${FILES_DEPS}\bin"
+!define FILES_UNOCONV "${FILES_DEPS}\bin"
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
 !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
 !define FILES_NETPBM "${FILES_DEPS}\bin"
+!define FILES_RSVG "${FILES_DEPS}\bin"
 !define FILES_DTL "${FILES_DEPS}\bin"
 !define FILES_DVIPOST "${FILES_DEPS}\bin"
 !define FILES_DVIPOST_PKG "${FILES_DEPS}\tex"
@@ -30,7 +32,7 @@ SetCompressor /SOLID lzma
 
 # CTAN and SourceForge select a mirror automatically
 
-!define DOWNLOAD_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
+!define DOWNLOAD_LATEX "http://mirrors.ctan.org/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
 
 #--------------------------------
 # Locations of setup files for components (for bundled setup)
@@ -42,34 +44,41 @@ SetCompressor /SOLID lzma
 
 !define APP_NAME "LyX"
 !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
+# for the proposed install folder we use the scheme "LyX 2.1" while we need for the registry the scheme "LyX 2.1.4"
+# to check if it is exactly this version (to support side by side installations)
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
-!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"
-!define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
-!define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
+!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}"
+!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
+!define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe"
+!define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}"
+!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
 !define APP_INFO "${APP_NAME} - The Document Processor"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 LyX Team"
+!define APP_WEBPAGE "http://www.lyx.org/"
+!define APP_WEBPAGE_INFO "${APP_NAME} Website"
+!define APP_WIKI "http://wiki.lyx.org"
+!define APP_WIKI_INFO "${APP_NAME} Wiki"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2016 by the LyX Team"
 
-!define APP_RUN "bin\LyXLauncher.exe"
+!define APP_RUN "bin\lyx.exe"
+!define BIN_LYX "lyx.exe"
 
-!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}"
-!define APP_REGKEY_SETUP "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
-!define APP_REGKEY_SETTINGS "Software\${APP_NAME}${APP_SERIES_KEY}\Settings"
+!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
+!define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
+!define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings"
 
-!define APP_REGNAME_DOC "LyX.Document"
+!define APP_REGNAME_DOC "${APP_NAME}.Document"
 
 !define APP_EXT ".lyx"
 !define APP_MIME_TYPE "application/lyx"
 
+!define APP_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
+
 #--------------------------------
 # Setup settings
 
 # Output file name can be configured using command line paramaters like
 # /DExeFile=/path/to/installer
 
-!ifndef SETUPTYPE
-  !define SETUPTYPE STANDARD
-!endif
- 
 !if ${SETUPTYPE} == STANDARD
 
   !define SETUP_EXE ${ExeFile}
@@ -85,15 +94,10 @@ SetCompressor /SOLID lzma
 !define SETUP_HEADERIMAGE "graphics\header.bmp"
 !define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
 !define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
-!define SETUP_UNINSTALLER_KEY "${APP_NAME}"
+!define SETUP_UNINSTALLER_KEY "${APP_NAME}${APP_SERIES_KEY}"
 
 #--------------------------------
-# Names of binaries to identify compontents
+# Names of binaries to identify components
 
-!define BIN_LATEX "tex.exe"
+!define BIN_LATEX "latex.exe"
 !define BIN_BIBTEXEDITOR "JabRef.exe"
-
-#--------------------------------
-# Custom NSIS plug-ins
-
-!addplugindir "${FILES_NSISPLUGINS}"