The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit ac6da262f19e9850a2ff7350167c6a907a6f1498
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun May 27 02:16:57 2012 +0200
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 d36662b..cb97aa3 100644
--- 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 7a6eb13..5bfad1c 100644
--- 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 08f620d..05776fd 100644
--- 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}\"
commit 3b6bf1ee065751fce131e4bd9c15acee6d4a39b6
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun May 27 02:15:18 2012 +0200
cmake/build.bat: correct a path proposal
diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index 02d40d8..c08865e 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -36,7 +36,7 @@ REM Add path to qmake here or set PATH correctly on your
system.
set PATH="D:\Qt\bin";%PATH%
REM Edit pathes here or set the environment variables on you system.
-set GNUWIN32_DIR=D:\LyXGit\Master\lyx-devel\lyx-windows-deps-msvc2010
+set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2010
set LYX_SOURCE=D:\LyXGit\Master\
set LYX_BUILD=D:\LyXGit\Master\compile-result
-----------------------------------------------------------------------
Summary of changes:
.../Win32/packaging/installer/include/filelist.nsh | 14 +++++++++++++-
development/Win32/packaging/installer/settings.nsh | 10 +++++-----
.../Win32/packaging/installer/setup/install.nsh | 1 +
development/cmake/build.bat | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
hooks/post-receive
--
The LyX Source Repository
