Win installer: backport changes from master and prepare for 2.2.2

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index d4f71b54f750741cd3de96ff07ff88ae27de5c86..90fd3c9a380b01bcea8c89149a0f44f3aa57c473 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,16 @@
-Changelog for LyX-221-1:
+Changelog for LyX-222-1:
+- installs LyX 2.2.2
+- updated to MiKTeX 2.9 build 6069
+- updated to Imagemagick 7.0.3-0
+- updated to JabRef 3.6
+- updated to NSIS 3.0
+
+
+Changelog for LyX-221-2:
+- fix broken LyX compilation that could not be installed on 32bit Windows
+
+
+Changelog for LyX-221-1:
 - installs LyX 2.2.1
 - recompiled LyX using MSVC 2015 update 3
 - updated to Qt 5.6.1-1

diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt
index 430caa5ff418a97d715bc456fd5aee94d294d61d..46a984e5f08f2bae18d9f051be5b5cff36aa04c2 100644 (file)
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -4,16 +4,16 @@
 2. open the file settings.nsh with a text editor
    and adapt there the following paths to the one on your PC, e.g.:
  !define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX"
- !define FILES_DEPS "C:\LyX-Installer\LyX2.1x\lyx-windows-deps-msvc2010"
+ !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
  !define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
-3. install the latest version 2.x of NSIS (http://nsis.sourceforge.net/Download)
+3. install the latest version 3.x of NSIS (http://nsis.sourceforge.net/Download)
 4. install the NSIS Large Strings extension (http://nsis.sourceforge.net/Special_Builds)
    (extract the extension ZIP file in your NSIS installation folder and this way overwrite some files) 
-5. open the file FindProc.zip (that is part of this bundle),
-   extract from it the file FindProc.dll to the Plugins folder of
+5. open the file FindProcDLL.zip (that is part of this bundle),
+   extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
    NSIS's installation folder
 6. open the file InetLoad.zip (that is part of this bundle),
-   extract from it the file InetLoad.dll to the Plugins folder of
+   extract from it the file InetLoad.dll to the folder \Plugins\x86-ansi of
    NSIS's installation folder
 7. right-click on the file lyx-standard.nsi and choose "Compile NSIS script"
    to compile the standard installer

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 25ca1413799eb2abf28a7214c4a7ac74f3cb1d4f..758fc6c4ca0a755bb5b4228f134b93e37e639f40 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,7 +11,7 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
 !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 1 # Start with 1 for the installer releases of each version
@@ -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.5"
+!define ImageMagickVersion "7.0.3"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !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"
+ !define JabRefInstall "external\JabRef_windows_3_6.exe"
+ !define SIZE_JABREF 26668 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6069.exe"
 !endif
 

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 65daf4f953a55982c578011fa61fc3ff10fbb33a..6894eda075fb3458c027456e95ce9389ad65f746 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -107,7 +107,6 @@ Section -ProgramFiles SecProgramFiles
   File /r "${FILES_IMAGEMAGICK}\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   # register ImageMagick
-  WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" "$INSTDIR\imagemagick\convert.exe $$"
   WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "$INSTDIR\imagemagick"
   WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "$INSTDIR\imagemagick\modules\coders"
   WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "ConfigurePath" "$INSTDIR\imagemagick"