Win installer: push the changes that are already part of the 2.2.0 installer

This commit is contained in:
Uwe Stöhr 2016-05-29 23:57:37 +02:00
parent 6799032e77
commit e7aaaeded3
7 changed files with 15 additions and 17 deletions

View File

@ -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)

View File

@ -1,4 +1,3 @@
unicode-data
l3experimental
l3kernel
l3packages
@ -168,7 +167,6 @@ tex-gyre
tipa
txfonts
zhmetrics
ascii
bbding
ifsym
marvosym

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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}" ""