From 52548a44369e80b9d1411d07fbf795007f78c703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 31 May 2016 01:22:12 +0200 Subject: [PATCH] Win installer: 2 bugfixes --- .../Win32/packaging/installer/ChangeLog.txt | 13 +++++++++---- .../packaging/installer/include/declarations.nsh | 6 +++--- .../Win32/packaging/installer/include/init.nsh | 8 +++++++- .../Win32/packaging/installer/settings.nsh | 15 +++++++-------- .../Win32/packaging/installer/setup/uninstall.nsh | 6 +++++- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index aa6d835051..335530bc2a 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,13 @@ -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-RC2-1: -- installs LyX 2.2.0 RC2 -- updated to Imagemagick 6.9.4-1 + +Changelog for LyX.220-1: +- installs LyX 2.2.0 +- updated to MiKTeX 2.9 build 5987 +- updated to Imagemagick 6.9.4-4 - updated to JabRef 3.3 - new thesaurus for Norwegian (Nynorsk) - updated thesaurus for English (US) and Norwegian (Bokmal) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 6657ffc4cb..8cf8d98f45 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -44,7 +44,7 @@ Configuration of LyX installer !define APP_NAME "LyX" !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}" -# for the proposed install folder we use the scheme "LyX 2.0" while we need for the registry the scheme "LyX 2.0.4" +# for the proposed install folder we use the scheme "LyX 2.1" while we need for the registry the scheme "LyX 2.1.4" # to check if it is exactly this version (to support side by side installations) !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}" @@ -57,12 +57,12 @@ 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" -!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200" +!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220" !define APP_REGKEY_SETUP "${APP_REGKEY}\Setup" !define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings" diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 9076a004c6..644773451f 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -14,7 +14,7 @@ Var LyXLangName !macro EXTERNAL_INIT COMPONENT # APP_REGKEY_SETUP = "Software\${APP_NAME}${APP_SERIES_KEY}\Setup" - # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX16 + # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX22 ReadRegStr $ComponentPath SHELL_CONTEXT "${APP_REGKEY_SETUP}" "${COMPONENT} Path" # BIN_LATEX etc are defined in settings.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 9fb8dea8ae..c67637246a 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -12,12 +12,14 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 2 !define APP_VERSION_REVISION 0 -!define APP_VERSION_EMERGENCY "RC1" # use "1" for an emergency release of LyX otherwise "" -!define APP_EMERGENCY_DOT "." # use "." 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_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,11 +47,8 @@ These typically need to be modified for each LyX release #-------------------------------- # MiKTeX and JabRef -# Sizes in KB -# it seems that some companies block ftp access by default, therefore http access is preferred here -!define MiKTeXRepo "http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/systems/win32/miktex/tm/packages/" -#!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/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 ImageMagickVersion "6.9.4" @@ -57,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 MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5872.exe" + !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 fb880401d3..3a4777fa66 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -73,11 +73,13 @@ Section "un.LyX" un.SecUnProgramFiles SetOutPath "$TEMP" RMDir /r "$INSTDIR" - # Registry keys + # Registry keys and values DeleteRegKey SHCTX "${APP_REGKEY_SETUP}" DeleteRegKey SHCTX "${APP_REGKEY}" DeleteRegKey SHCTX "${APP_UNINST_KEY}" DeleteRegKey HKCR "Applications\lyx.exe" + DeleteRegValue HKCR "LyX.Document\Shell\open\command" "" + DeleteRegValue HKCR "LyX.Document\DefaultIcon" "" # File associations ReadRegStr $FileAssociation SHELL_CONTEXT "Software\Classes\${APP_EXT}" "" @@ -112,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