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

win installer: port recent changes from branch

Browse Source
This commit is contained in:
Uwe Stöhr 2016-07-26 23:41:23 +02:00
parent fa85bf9b59
commit 056422dae9
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,14 @@
Changelog for LyX-220-3: Changelog for LyX-221-1:
- installs LyX 2.2.1
- recompiled LyX using MSVC 2015 update 3
- updated to Qt 5.6.1-1
- updated to MiKTeX 2.9 build 6022
- updated to Imagemagick 6.9.5
- updated to Python 2.7.12
- updated to JabRef 3.5
Changelog for LyX-220-3:
- updated to Qt 5.6.1 - updated to Qt 5.6.1
- updated to MiKTeX 2.9 build 5997 - updated to MiKTeX 2.9 build 5997
- updated to JabRef 3.4 - updated to JabRef 3.4

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

@ -61,6 +61,7 @@ Lists of files to include in the installer
${FILE}msvcr100.dll" ${FILE}msvcr100.dll"
${FILE}msvcp100.dll" ${FILE}msvcp100.dll"
# Files needed for MSVC 2015 # Files needed for MSVC 2015
${FILE}concrt140.dll"
${FILE}msvcp140.dll" ${FILE}msvcp140.dll"
${FILE}vcamp140.dll" ${FILE}vcamp140.dll"
${FILE}vccorlib140.dll" ${FILE}vccorlib140.dll"

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

@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2 !define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 2 !define APP_VERSION_MINOR 2
!define APP_VERSION_REVISION 0 !define APP_VERSION_REVISION 1
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise "" !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_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 1 # 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
@ -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 MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
!define MiKTeXDeliveredVersion "2.9" !define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "6.9.4" !define ImageMagickVersion "6.9.5"
# definitions for the Complete installer # definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE !if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef_windows_3_4.exe" !define JabRefInstall "external\JabRef_windows_3_5.exe"
!define SIZE_JABREF 25700 # size in KB !define SIZE_JABREF 26252 # size in KB
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5997.exe" !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
!endif !endif