installer: 2 bugbixes

- avoid doubled semicolon in LaTeX editor path list
- correct path to the JabRef installation folder in LyX's PATH
- updated to JabRef 2.8.1
- rename the installer executables from LyX-205-x-Bundle.exe
This commit is contained in:
Uwe Stöhr 2012-11-14 23:27:49 +01:00
parent 25e4a1ce6b
commit 856320f8eb
4 changed files with 20 additions and 13 deletions

View File

@ -1,4 +1,8 @@
Changelog for LyX-205-2:
Changelog for LyX-205-3:
- updated to JabRef 2.8.1
Changelog for LyX-205-2:
- the installer detects now existing spell-checker and thesaurus dictionaries
of existing LyX installations
- fixed un/installation of Jabref if bundle installer is executed without having admin privileges

View File

@ -235,8 +235,10 @@ Function EditorCheck
${else}
SetRegView 32
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation"
StrCpy $0 $0 -1 # remove the "\"
StrCpy $EditorPath "$EditorPath;$0"
${if} $0 != ""
StrCpy $0 $0 -1 # remove the "\"
StrCpy $EditorPath "$EditorPath;$0"
${endif}
${endif}
SetRegView 32
@ -244,7 +246,7 @@ Function EditorCheck
StrCpy $0 ""
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation"
${if} $0 != ""
StrCpy $EditorPath "$EditorPath;$0"
StrCpy $EditorPath "$EditorPath;f$0"
${endif}
FunctionEnd

View File

@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 5
!define APP_VERSION_BUILD 2 # Start with 1 for the installer releases of each version
!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
@ -22,10 +22,10 @@ These typically need to be modified for each LyX release
# Typical names for the release are "LyX-201-1-Installer.exe" etc.
!ifndef ExeFile
!define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe"
!define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-Installer-${APP_VERSION_BUILD}.exe"
!endif
!ifndef BundleExeFile
!define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Bundle.exe"
!define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-Bundle-${APP_VERSION_BUILD}.exe"
!endif
!ifndef MinimalExeFile
!define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"
@ -35,10 +35,10 @@ These typically need to be modified for each LyX release
# File locations
# !!! you need to adjust them to the folders in your Windows system !!!
!define FILES_LYX "C:\LyX\lyx-20-install"
!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
!define FILES_BUNDLE "C:\LyX\depsbundle"
!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3"
!define FILES_LYX "D:\LyXPackage2.0\LyX"
!define FILES_DEPS "D:\LyXGit\2.0.x\lyx-windows-deps-msvc2008"
!define FILES_BUNDLE "D:\LyX\depsbundle"
!define FILES_QT "D:\Qt"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
@ -48,13 +48,13 @@ 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 JabRefVersion "2.8"
!define JabRefVersion "2.8.1"
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "6.8.0"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef-2.8-setup.exe"
!define JabRefInstall "external\JabRef-2.8.1-setup.exe"
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4521.exe"
!define SIZE_DOWNLOAD_LATEX 162476
!define SIZE_LATEX 380000

View File

@ -111,6 +111,7 @@ Section -ProgramFiles SecProgramFiles
${if} $MultiUser.Privileges == "Admin"
${orif} $MultiUser.Privileges == "Power"
ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"
StrCpy $PathBibTeXEditor $PathBibTeXEditor -14 # remove "\uninstall.exe"
${else}
# for non-admin users we can only check if it is in the start menu
ReadRegStr $PathBibTeXEditor HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu"