commit fc98efa7f3e23be35090f324b32976e9e170860f
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue Mar 26 02:37:19 2019 +0100
Win installer: fix bug on init
- also remove unused code
---
.../Win32/packaging/installer/include/init.nsh | 7 +------
.../packaging/installer/include/variables.nsh | 2 --
development/Win32/packaging/installer/settings.nsh | 10 +++++-----
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 59370d4..4276a07 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -610,11 +610,6 @@ Function .onInit
Abort
${endif}
- # read the user and computer name
- ReadRegStr $ComputerName HKLM
"System\CurrentControlSet\Control\ComputerName\ActiveComputerName"
"ComputerName"
- System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
- StrCpy $UserName $0
-
!insertmacro MULTIUSER_INIT
# check if this LyX version is already installed
@@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over
an existing one
# because he won't have a chance to deny this
- StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+ StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from
LyXUtils.nsh
${if} $5 == "False"
diff --git a/development/Win32/packaging/installer/include/variables.nsh
b/development/Win32/packaging/installer/include/variables.nsh
index bb6982c..57f507c 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -14,7 +14,6 @@ Var APPDATemp
Var AppPre
var AppSubfolder
Var AppSuff
-Var ComputerName
Var CreateDesktopIcon
Var CreateFileAssociations
Var DictCode
@@ -49,6 +48,5 @@ Var ThesCode
Var ThesCodes
Var UpdateFNDBReturn
Var UserList
-Var UserName
Var LangName
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 175b664..56bccaf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,19 +11,19 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 3
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
!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 4 # 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 2018
+!define COPYRIGHT_YEAR 2019
#--------------------------------
# Installer file name
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
!ifndef ExeFile
!define ExeFile
"${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
-!define ImageMagickVersion "7.0.7"
+!define ImageMagickVersion "7.0.8"
