Win installer: fix detection of 64bit Krita and 64bit JabRef

also update the changelog
This commit is contained in:
Uwe Stöhr 2017-11-01 14:34:36 +01:00
parent bffb17112b
commit d158f78f87
2 changed files with 21 additions and 2 deletions

View File

@ -1,11 +1,17 @@
Changelog for LyX-224-1: Changelog for LyX-224-1:
- installs LyX 2.2.4 - installs LyX 2.2.4
- fix bug that the BibTeX editor Jabref and the image editor Krita
were not detected as 64bit application
- updated to MiKTeX 2.9 build 6361 - updated to MiKTeX 2.9 build 6361
- updated to ImageMagick 7.0.6-2 - updated to ImageMagick 7.0.7-8
- updated to Perl 5.24.2.1 - updated to Perl 5.24.2.1
- updated to Python 2.7.14 - updated to Python 2.7.14
- updated to Qt 5.6.3 - updated to Qt 5.6.3
- updated to Ghostscript 9.22 - updated to Ghostscript 9.22
- updated spell checker dictionaries for English (GB, US), Portuguese, Scottish,
Tibetan and Ukrainian
(To benefit from them you must uninstall an already installed LyX 2.2.x and
then use this installer.)
Changelog for LyX-223-1: Changelog for LyX-223-1:

View File

@ -144,6 +144,9 @@ Function MissingPrograms
StrCpy $ImageEditor "Photoshop" StrCpy $ImageEditor "Photoshop"
${endif} ${endif}
# check for Krita # check for Krita
${if} ${RunningX64}
SetRegView 64
${endif}
ReadRegStr $0 HKLM "SOFTWARE\Classes\Krita.Document\shell\open\command" "" ReadRegStr $0 HKLM "SOFTWARE\Classes\Krita.Document\shell\open\command" ""
${if} $0 != "" ${if} $0 != ""
StrCpy $0 "$0" -16 # delete '\krita.exe" "%1"' StrCpy $0 "$0" -16 # delete '\krita.exe" "%1"'
@ -155,12 +158,22 @@ Function MissingPrograms
${endif} ${endif}
StrCpy $ImageEditor "Krita" StrCpy $ImageEditor "Krita"
${endif} ${endif}
${if} ${RunningX64}
SetRegView 32
${endif}
# test if and where the BibTeX-editor JabRef is installed # test if and where the BibTeX-editor JabRef is installed
ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path" ${if} ${RunningX64}
SetRegView 64
${endif}
ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\JabRef" "Path"
# if not installed as admin, check for user
${if} $PathBibTeXEditor == "" ${if} $PathBibTeXEditor == ""
ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path" ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
${endif} ${endif}
${if} ${RunningX64}
SetRegView 32
${endif}
${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}" ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
StrCpy $PathBibTeXEditor "" StrCpy $PathBibTeXEditor ""