anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: update to Qt 5.9

Browse Source 
- also remove Qt5XML in the installer as it appears not to be used by LyX
- update to latest MikTeX installer which resolves some problems
- add a note that pdfview is not yet ready for full Unicode support
This commit is contained in:
Uwe Stöhr 2017-11-11 18:34:25 +01:00
parent b5c3a4ed0d
commit 241bf7d58b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/Win32/packaging/installer/ChangeLog.txt
View File

@ -1,12 +1,10 @@
Changelog for LyX-230-RC2: Changelog for LyX-230-RC1:
- correct display of installer text for many languages
Changelog for LyX-230-RC1:
- installs LyX 2.3.0 RC1 - installs LyX 2.3.0 RC1
- correct display of installer text for many languages
- fix bug that the BibTeX editor Jabref and the image editor Krita - fix bug that the BibTeX editor Jabref and the image editor Krita
were not detected as 64bit application were not detected as 64bit application
- updated to Qt 5.6.3 - updated to Qt 5.9.2
- updated to MiKTeX 2.9 build 6520
- updated to ImageMagick 7.0.7-8 - updated to ImageMagick 7.0.7-8
- updated to Ghostscript 9.22 - updated to Ghostscript 9.22
- updated thesaurus for Ukrainian - updated thesaurus for Ukrainian

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

@ -22,7 +22,6 @@ Lists of files to include in the installer
${FILE}Qt5Svg.dll" ${FILE}Qt5Svg.dll"
${FILE}Qt5Widgets.dll" ${FILE}Qt5Widgets.dll"
${FILE}Qt5WinExtras.dll" ${FILE}Qt5WinExtras.dll"
${FILE}Qt5Xml.dll"
!macroend !macroend
@ -49,7 +48,6 @@ Lists of files to include in the installer
!macro FileListQtPlatforms COMMAND DIRECTORY !macro FileListQtPlatforms COMMAND DIRECTORY
${FILE}qminimal.dll" ${FILE}qminimal.dll"
${FILE}qoffscreen.dll"
${FILE}qwindows.dll" ${FILE}qwindows.dll"
!macroend !macroend

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

@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 0 !define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "RC-1" # use "1" for an emergency release of LyX otherwise "" !define APP_VERSION_EMERGENCY "RC-1" # use "1" for an emergency release of LyX otherwise ""
!define APP_EMERGENCY_DOT "" # use "." 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 4 # 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 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
@ -38,7 +38,7 @@ These typically need to be modified for each LyX release
!define FILES_LYX "D:\LyXPackage2.3\LyX" !define FILES_LYX "D:\LyXPackage2.3\LyX"
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\Qt\Qt5.6.3\5.6.3\msvc2015" !define FILES_QT "C:\Qt\Qt5.9.2\5.9.2\msvc2015"
!define ClassFileDir "${FILES_LYX}\Resources\tex" !define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex" !define DVIPostFileDir "${FILES_DEPS}\tex"
@ -52,6 +52,6 @@ These typically need to be modified for each LyX release
# definitions for the Complete installer # definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE !if ${SETUPTYPE} == BUNDLE
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6361.exe" !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
!endif !endif

6
development/Win32/pdfview/pdfview.nsi
View File

@ -1,4 +1,4 @@
/* /*
Windows PDF view helper Windows PDF view helper
Author: Uwe Stöhr and Joost Verburg Author: Uwe Stöhr and Joost Verburg
@ -10,6 +10,10 @@ but works around the file locking problems of Adobe Reader and Acrobat.
*/ */
# FIXME
#Unicode true
#doesn't work with the Uniode system.dll of NSIS 3.0.2
!include LogicLib.nsh !include LogicLib.nsh
!include FileFunc.nsh !include FileFunc.nsh