anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer:

Browse Source 
- install also Qt's image plugins for faster image loading
- update some versions and paths
This commit is contained in:
Uwe Stöhr 2012-05-27 02:16:57 +02:00
parent 3b6bf1ee06
commit ac6da262f1
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/Win32/packaging/installer/include/filelist.nsh
View File

@ -22,6 +22,18 @@ Lists of files to include in the installer
!macroend !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
!macro FileListMSVC COMMAND DIRECTORY !macro FileListMSVC COMMAND DIRECTORY
# Manifest not needed for 2010 # Manifest not needed for 2010

10
development/Win32/packaging/installer/settings.nsh
View File

@ -11,8 +11,8 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2 !define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0 !define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 3 !define APP_VERSION_REVISION 4
!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}" # Version to display !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_LYX "C:\LyX\lyx-20-install"
!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20" !define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
!define FILES_BUNDLE "C:\LyX\depsbundle" !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 ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\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 JabRefVersion "2.8"
!define MiKTeXDeliveredVersion "2.9" !define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "6.7.6" !define ImageMagickVersion "6.7.7"
# definitions for the Complete installer # definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE !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 MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4407.exe"
!define SIZE_DOWNLOAD_LATEX 162476 !define SIZE_DOWNLOAD_LATEX 162476
!define SIZE_LATEX 380000 !define SIZE_LATEX 380000

1
development/Win32/packaging/installer/setup/install.nsh
View File

@ -28,6 +28,7 @@ Section -ProgramFiles SecProgramFiles
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\" !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
!insertmacro FileListQtBin File "${FILES_QT}\bin\" !insertmacro FileListQtBin File "${FILES_QT}\bin\"
!insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
!insertmacro FileListDll File "${FILES_DEPS}\bin\" !insertmacro FileListDll File "${FILES_DEPS}\bin\"
!insertmacro FileListMSVC File "${FILES_MSVC}\" !insertmacro FileListMSVC File "${FILES_MSVC}\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\" !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"