commit dd2aef2c333f4b4c43f779489ffd8bf55a484192
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue May 31 01:20:09 2016 +0200
Win installer: prepare for 2.1.5 and bugfixes
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index bed957b..df03314 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,11 @@
-Changelog for LyX-214-7:
+Changelog for LyX-215-1:
+- installs LyX 2.1.5
+- 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-214-7:
- use a new default download server for missing LaTeX packages
- updated to MiKTeX 2.9 build 5987
- updated to Imagemagick 6.9.4-1
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index fee8c86..315e507 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 de9bf25..395a869 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 a0d4b40..f4a869a 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,17 +11,19 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 1
-!define APP_VERSION_REVISION 4
+!define APP_VERSION_REVISION 5
!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 7 # 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
+!define COPYRIGHT_YEAR 2016
+
#--------------------------------
# Installer file name
-# Typical names for the release are "LyX-201-Installer-1.exe" etc.
+# Typical names for the release are "LyX-211-Installer-1.exe" etc.
!ifndef ExeFile
!define ExeFile
"LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -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/";
@@ -56,7 +57,7 @@ These typically need to be modified for each LyX release
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef-2.11-setup.exe"
- !define SIZE_JABREF 14100
+ !define SIZE_JABREF 14100 # 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 cc96d61..d39f7aa 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -68,11 +68,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}" ""
@@ -104,6 +106,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
