From c4a93a490918249865613059359fe368b899a2c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 7 Jan 2011 00:28:45 +0000 Subject: [PATCH] installer: don't use Python 3.x for LyX; fixes #7143 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37144 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/Win32/packaging/AltInstaller/ChangeLog.txt | 9 ++++++++- .../Win32/packaging/AltInstaller/MissingPrograms.nsh | 8 ++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt index 1eb9621c9c..050fbef1c5 100644 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt @@ -1,4 +1,11 @@ -Version 5.8 +Version 5.9 +- LyX 2.0xxx +- updated to eLyXer 1.1.2 +- fix bug that a detected installed Python 3.x was used for LyX (LyX bug 7143) + LyX only works properly with Python 2.x + + +Version 5.8 - LyX 2.0beta2 - updated to eLyXer 1.1.0 diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh index 8746ac3cb6..640fa1a1dc 100644 --- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh +++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh @@ -87,6 +87,8 @@ Function MissingPrograms # test if Python is installed # only use an existing python when it is version 2.5 or newer because some # older Compaq and Dell PCs were delivered with outdated Python interpreters + # Python 3.x was reported not to work with LyX properly, see + # http://www.lyx.org/trac/ticket/7143 ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" ${if} $PythonPath == "" ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" @@ -94,12 +96,6 @@ Function MissingPrograms ${if} $PythonPath == "" ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" "" ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" "" - ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.1\InstallPath" "" - ${endif} ${if} $PythonPath != "" StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end StrCpy $DelPythonFiles "True" -- 2.39.5