installer:

- install also Qt's image plugins for faster image loading
- update some versions and paths

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index d36662b307604f5988a15c779dc9089d0ae9cdae..cb97aa3d35ca9cf495c28b4190aee92f21e1bcb2 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -18,7 +18,19 @@ Lists of files to include in the installer
 !macro FileListQtBin COMMAND DIRECTORY
 
   ${FILE}QtCore4.dll"
-  ${FILE}QtGui4.dll"  
+  ${FILE}QtGui4.dll"
+
+!macroend
+
+!macro FileListQtImageformats COMMAND DIRECTORY
+
+  ${FILE}qico4.dll"
+  ${FILE}qgif4.dll"
+  ${FILE}qjpeg4.dll"
+  ${FILE}qmng4.dll"
+  ${FILE}qsvg4.dll"
+  ${FILE}qtga4.dll"
+  ${FILE}qtiff4.dll"
 
 !macroend
 

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 7a6eb13f38ddb0cfe3c73d517a0392afd1e6d865..5bfad1c0b68c95be08a66255a071ac8d10a887e0 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,8 +11,8 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 0
-!define APP_VERSION_REVISION 3
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
+!define APP_VERSION_REVISION 4
+!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}" # Version to display
 
@@ -38,7 +38,7 @@ These typically need to be modified for each LyX release
 !define FILES_LYX "C:\LyX\lyx-20-install"
 !define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
 !define FILES_BUNDLE "C:\LyX\depsbundle"
-!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.7.3"
+!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.2"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
@@ -50,11 +50,11 @@ These typically need to be modified for each LyX release
 
 !define JabRefVersion "2.8"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.7.6"
+!define ImageMagickVersion "6.7.7"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef-2.7-setup.exe"
+ !define JabRefInstall "external\JabRef-2.8-setup.exe"
  !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4407.exe"
  !define SIZE_DOWNLOAD_LATEX 162476
  !define SIZE_LATEX 380000

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 08f620d595d6fdc0e63ddc5a74034fa2f0ee75f7..05776fdcb1be5c83ce5facb0b37be62e30ea4f19 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -28,6 +28,7 @@ Section -ProgramFiles SecProgramFiles
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
+  !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"