mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 19:07:45 +00:00
Fix bug #7870: Win installer: check for Gnumeric
Gnumeric is needed for the spreadsheet external inset template.
This commit is contained in:
parent
4434df7bf0
commit
8c9da0c2d6
@ -9,6 +9,7 @@ Detection of external component locations
|
|||||||
Function SearchExternal
|
Function SearchExternal
|
||||||
Call SearchLaTeX
|
Call SearchLaTeX
|
||||||
Call SearchBibTeXEditor
|
Call SearchBibTeXEditor
|
||||||
|
Call SearchGnumeric
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
#--------------------------------
|
#--------------------------------
|
||||||
@ -111,3 +112,26 @@ Function SearchBibTeXEditor
|
|||||||
${EndIf}
|
${EndIf}
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
|
#--------------------------------
|
||||||
|
# Gnumeric
|
||||||
|
|
||||||
|
Function SearchGnumeric
|
||||||
|
|
||||||
|
ReadRegStr $PathGnumeric HKCU "Software\GNOME\Gnumeric" "Path"
|
||||||
|
|
||||||
|
${IfNot} ${FileExists} "$PathGnumeric\gnumeric.exe"
|
||||||
|
ReadRegStr $PathGnumeric HKLM "Software\GNOME\Gnumeric" "Path"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
|
${IfNot} ${FileExists} "$PathGnumeric\gnumeric.exe"
|
||||||
|
ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" ""
|
||||||
|
${If} $0 != ""
|
||||||
|
StrCpy $0 $0 -18 # remove \"gnumeric.exe" "%1"\"
|
||||||
|
StrCpy $PathGnumeric $0
|
||||||
|
${EndIf}
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
|
FunctionEnd
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@ Variables that are shared between multiple files
|
|||||||
Var PathLaTeX
|
Var PathLaTeX
|
||||||
Var PathLaTeXLocal
|
Var PathLaTeXLocal
|
||||||
Var PathBibTeXEditor
|
Var PathBibTeXEditor
|
||||||
|
Var PathGnumeric
|
||||||
|
|
||||||
Var SetupLaTeX
|
Var SetupLaTeX
|
||||||
Var SizeLaTeX
|
Var SizeLaTeX
|
||||||
|
@ -93,7 +93,10 @@ Section -Configure
|
|||||||
${EndIf}
|
${EndIf}
|
||||||
${If} $PathBibTeXEditor != ""
|
${If} $PathBibTeXEditor != ""
|
||||||
StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
|
StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
${If} $PathGnumeric != ""
|
||||||
|
StrCpy $PathPrefix "$PathPrefix;$PathGnumeric"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
|
FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
|
||||||
|
|
||||||
|
@ -242,3 +242,6 @@ What's new
|
|||||||
|
|
||||||
- Remove a temporary log file from the user directory after reconfigure.
|
- Remove a temporary log file from the user directory after reconfigure.
|
||||||
|
|
||||||
|
- Windows installer now detects Gnumeric which is needed for the
|
||||||
|
spreadsheet external inset template (bug 7870).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user