win installer: port recent changes from branch

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index f512d25e2c7735b1858e3a2b87b77c4914947efa..d4f71b54f750741cd3de96ff07ff88ae27de5c86 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,14 @@
-Changelog for LyX-220-3:
+Changelog for LyX-221-1:
+- installs LyX 2.2.1
+- recompiled LyX using MSVC 2015 update 3
+- updated to Qt 5.6.1-1
+- updated to MiKTeX 2.9 build 6022
+- updated to Imagemagick 6.9.5
+- updated to Python 2.7.12
+- updated to JabRef 3.5
+
+
+Changelog for LyX-220-3:
 - updated to Qt 5.6.1
 - updated to MiKTeX 2.9 build 5997
 - updated to JabRef 3.4

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 54863f4a329104ac838c95ea509ed542b4812de4..20342ca8624bfe057b71353eff4700f060de5572 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -61,6 +61,7 @@ Lists of files to include in the installer
   ${FILE}msvcr100.dll"
   ${FILE}msvcp100.dll"
   # Files needed for MSVC 2015
+  ${FILE}concrt140.dll"
   ${FILE}msvcp140.dll"
   ${FILE}vcamp140.dll"
   ${FILE}vccorlib140.dll"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 6553c336053df29d127d8a551420ad9253c89a07..25ca1413799eb2abf28a7214c4a7ac74f3cb1d4f 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 0
+!define APP_VERSION_REVISION 1
 !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 3 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 1 # 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
 
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
 !define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
 
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.9.4"
+!define ImageMagickVersion "6.9.5"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !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"
+ !define JabRefInstall "external\JabRef_windows_3_5.exe"
+ !define SIZE_JABREF 26252 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
 !endif