diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index e5f761d362..730c35ccf1 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -131,6 +131,13 @@ Function MissingPrograms # test if metafile2eps is installed ReadRegStr $WMFPath HKLM "Software\Microsoft\Windows NT\CurrentVersion\Print\Printers\Metafile to EPS Converter" "Name" + + # test if Gnumeric is installed + ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" "" + ${if} $0 != "" + StrCpy $0 $0 -18 # remove "gnumeric.exe" "%1"" + StrCpy $GnumericPath $0 + ${endif} FunctionEnd diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index eca0397864..681294a1b4 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -23,6 +23,7 @@ Var CreateFileAssociations Var DelPythonFiles Var EditorPath Var GhostscriptPath +Var GnumericPath Var ImageEditorPath !if ${SETUPTYPE} == BUNDLE Var InstallJabRef diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 3bdeac4c3d..686cf27913 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -11,7 +11,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 1 +!define APP_VERSION_REVISION 2 !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}" # Version to display @@ -50,7 +50,7 @@ These typically need to be modified for each LyX release !define JabRefVersion "2.7" !define MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "6.7.2" +!define ImageMagickVersion "6.7.3" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 55704cc9c3..80a2123471 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -118,6 +118,9 @@ Section -Configure ${if} $WMFPath != "" StrCpy $PathPrefix "$PathPrefix;$WMFPath" ${endif} + ${if} $GnumericPath != "" + StrCpy $PathPrefix "$PathPrefix;$GnumericPath" + ${endif} ${if} $PathBibTeXEditor != "" StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor" ${EndIf}