From: Uwe Stöhr Date: Sun, 20 Sep 2015 23:53:15 +0000 (+0200) Subject: Win installer: preparations for a new build X-Git-Tag: 2.2.0alpha1~300 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=681903566099b72ff96310f57ab27d50193b13a0;p=lyx.git Win installer: preparations for a new build - the long awaited MiKTeX installer is available, this fixes many installation errors in LyX is installed for the first time (I will provide a new installer build as soon as I find more time) --- diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 2394f24063..4ea00c094f 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,17 @@ -Changelog for LyX-214-2: +Changelog for LyX-214-3: +- updated to MiKTeX 2.9 build 5721 + + +Changelog for LyX-214-2: - fix bug that viewing/exporting of some file formats failed because of unknown executable for .py files - updated to Python 2.7.10 (fixes problems that LyX got erroneous if Python 2.7.10 was installed before LyX) +- updated spell-checker dictionary for English (GB) + (To benefit from them you must uninstall an already installed LyX 2.1.x and + then use this installer.) +- updated thesaurus for Slovenian + (you need to reinstall LyX to benefit from this) Changelog for LyX-214-1: diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 292c3736d4..882c3ef1dd 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 4 !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_VERSION_BUILD 1 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 3 # 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 @@ -39,7 +39,7 @@ These typically need to be modified for each LyX release !define FILES_LYX "D:\LyXPackage2.1\LyX" !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010" -!define FILES_QT "C:\Qt\4.8.6" +!define FILES_QT "C:\Qt\4.8.7" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" @@ -59,6 +59,6 @@ These typically need to be modified for each LyX release !if ${SETUPTYPE} == BUNDLE !define JabRefInstall "external\JabRef-2.10-setup.exe" !define SIZE_JABREF 14100 - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5105.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5721.exe" !endif