From eb9a118553a24cde919f84876f21342bb174d6a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 31 May 2016 01:25:07 +0200 Subject: [PATCH] Win installer: 2 bugfixes --- development/Win32/packaging/installer/ChangeLog.txt | 6 +++++- .../Win32/packaging/installer/include/declarations.nsh | 2 +- development/Win32/packaging/installer/include/init.nsh | 6 ++++++ development/Win32/packaging/installer/settings.nsh | 7 ++++--- development/Win32/packaging/installer/setup/uninstall.nsh | 2 ++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index ac2100022c..335530bc2a 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,8 @@ -Todo: add lyx.de to mirror list +Changelog for LyX-220-2: +- remove also the user dependent LyX settings from the registry if the user + preferences should be uninstalled +- calculate the required installation size correctly + Changelog for LyX.220-1: - installs LyX 2.2.0 diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 554aef8c39..8cf8d98f45 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -57,7 +57,7 @@ Configuration of LyX installer !define APP_WEBPAGE_INFO "${APP_NAME} Website" !define APP_WIKI "http://wiki.lyx.org" !define APP_WIKI_INFO "${APP_NAME} Wiki" -!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2016 by the LyX Team" +!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-${COPYRIGHT_YEAR} by the LyX Team" !define APP_RUN "bin\lyx.exe" !define BIN_LYX "lyx.exe" diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index cd2de30321..644773451f 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -46,6 +46,12 @@ FunctionEnd Section "!${APP_NAME}" SecCore SectionIn RO + !if ${SETUPTYPE} == BUNDLE + # if no TeX was found MiKTeX will be installed which requires space + !if $PathLaTeX == "" + AddSize 1020000 # size in KB + !endif + !endif SectionEnd Section "$(SecFileAssocTitle)" SecFileAssoc diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 210c3d4792..1af4a8e2fe 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,10 +14,12 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 0 !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 2 # 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 COPYRIGHT_YEAR 2016 + #-------------------------------- # Installer file name @@ -45,7 +47,6 @@ These typically need to be modified for each LyX release #-------------------------------- # MiKTeX and JabRef -# Sizes in KB !define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/" @@ -55,7 +56,7 @@ These typically need to be modified for each LyX release # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE !define JabRefInstall "external\JabRef_windows_3_3.exe" - !define SIZE_JABREF 25730 + !define SIZE_JABREF 25730 # size in KB !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5987.exe" !endif diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 1bef3f080d..3a4777fa66 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -114,6 +114,8 @@ Section /o "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences # remove LyX's config files StrCpy $AppSubfolder ${APP_DIR_USERDATA} Call un.DelAppPathSub # function from LyXUtils.nsh + # remove registry settings + DeleteRegKey HKCU "Software\LyX\LyX${APP_SERIES_NAME}" SectionEnd -- 2.39.2