Win installer: new version with Qt 5.6.1

[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 56b2b7bb378f92eedd213672fb13bfe8d9972d7e..6553c336053df29d127d8a551420ad9253c89a07 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -10,18 +10,20 @@ These typically need to be modified for each LyX release
 # Version number
 
 !define APP_VERSION_MAJOR 2
-!define APP_VERSION_MINOR 1
-!define APP_VERSION_REVISION 2
+!define APP_VERSION_MINOR 2
+!define APP_VERSION_REVISION 0
 !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 2 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 3 # 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
 
+!define COPYRIGHT_YEAR 2016
+
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-201-Installer-1.exe" etc.
+# Typical names for the release are "LyX-211-Installer-1.exe" etc.
 
 !ifndef ExeFile
   !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -37,28 +39,24 @@ These typically need to be modified for each LyX release
 # File locations
 # !!! you need to adjust them to the folders in your Windows system !!!
 
-!define FILES_LYX "C:\LyX\LyXPackage\LyX"
-!define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008"
-!define FILES_QT "C:\LyX\LyXPackage\LyX"
+!define FILES_LYX "D:\LyXPackage2.2\LyX"
+!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
+!define FILES_QT "C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
 #--------------------------------
-# MiKTeX
-# Sizes in KB
+# MiKTeX and JabRef
 
-# it seems that some companies block ftp access by default, therefore http access is preferred here
-!define MiKTeXRepo "http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
-#!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+!define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
 
-!define JabRefVersion "2.10"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.8.0"
+!define ImageMagickVersion "6.9.4"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef-2.10-setup.exe"
- !define SIZE_JABREF 14100
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5105.exe"
+ !define JabRefInstall "external\JabRef_windows_3_4.exe"
+ !define SIZE_JABREF 25700 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5997.exe"
 !endif