diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index aa6d835051..ac2100022c 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,9 @@ Todo: add lyx.de to mirror list -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/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 496474cacc..aa5d65f488 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -1,4 +1,3 @@ -unicode-data l3experimental l3kernel l3packages @@ -168,7 +167,6 @@ tex-gyre tipa txfonts zhmetrics -ascii bbding ifsym marvosym diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index 045b2715bb..68c6c36fbc 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -214,7 +214,6 @@ FunctionEnd ${if} $PathLaTeX == "" # launch MiKTeX's installer MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" /SD IDOK - MessageBox MB_OK|MB_ICONINFORMATION "${MiKTeXInstall} --shared" ${if} $MultiUser.Privileges != "Admin" ${andif} $MultiUser.Privileges != "Power" # call the non-admin version diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 6657ffc4cb..554aef8c39 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}" @@ -62,7 +62,7 @@ Configuration of LyX installer !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..cd2de30321 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 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 9fb8dea8ae..210c3d4792 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -12,9 +12,9 @@ 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_BUILD 2 # Start with 1 for the installer releases of each version +!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 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display @@ -47,9 +47,7 @@ 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" @@ -58,6 +56,6 @@ These typically need to be modified for each LyX release !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 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..1bef3f080d 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}" ""