From d2a8cd8619f9ad9a06a42ecf5e338c60d6d389bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 23 Apr 2017 13:57:45 +0200 Subject: [PATCH] Win installer: prepare for alpha 1 release --- .../Win32/packaging/installer/ChangeLog.txt | 12 +++++++++++- .../Win32/packaging/installer/settings.nsh | 16 ++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index b6df3a25d4..52703ca267 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,14 @@ -Changelog for LyX-222-4: +Changelog for LyX-223-alpha1: +- installs LyX 2.3.0 alpha1 +- updated to MiKTeX 2.9 build 6236 + (fixes potential problems with the installation of LaTeX packages) +- updated to ImageMagick 7.0.5-4 +- updated to JabRef 3.8.2 +- updated to NSIS 3.0.1 +- updated to Ghostscript 9.21 + + +Changelog for LyX-222-4: - fix bug that spell checker for Vietnamese was not installed - fix bug that thesaurus for Ukrainian was not installed - updated to MiKTeX 2.9 build 6219 (fixes problems with the update of LaTeX packages) diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index f72614c6e4..eee1d18881 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -10,11 +10,11 @@ These typically need to be modified for each LyX release # Version number !define APP_VERSION_MAJOR 2 -!define APP_VERSION_MINOR 2 -!define APP_VERSION_REVISION 2 +!define APP_VERSION_MINOR 3 +!define APP_VERSION_REVISION alpha1 !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 4 # 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 @@ -39,7 +39,7 @@ These typically need to be modified for each LyX release # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_LYX "D:\LyXPackage2.2\LyX" +!define FILES_LYX "D:\LyXPackage2.3\LyX" !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" !define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015" !define ClassFileDir "${FILES_LYX}\Resources\tex" @@ -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 MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "7.0.4" +!define ImageMagickVersion "7.0.5" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define JabRefInstall "external\JabRef_windows_3_8_1.exe" - !define SIZE_JABREF 36566 # size in KB - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6219.exe" + !define JabRefInstall "external\JabRef_windows_3_8_2.exe" + !define SIZE_JABREF 36831 # size in KB + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6236.exe" !endif