X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos.cpp;h=616b9c6936d4a16594f239fbb2dc1d2332db1358;hb=cf14e814124ccbc8155fa1dde98d03be319c0e87;hp=b1e4e09b8eb0d9c38e0b64be93bd35bb174c9ab8;hpb=fdf81a9bab2f4f50a3eaf22cc0e09ac454f470ed;p=lyx.git

diff --git a/src/support/os.cpp b/src/support/os.cpp
index b1e4e09b8e..616b9c6936 100644
--- a/src/support/os.cpp
+++ b/src/support/os.cpp
@@ -11,6 +11,10 @@
 
 #include <config.h>
 
+#ifdef _WIN32
+# define _WIN32_WINNT 0x0600
+#endif
+
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
@@ -89,28 +93,73 @@ static string const find_python_binary()
 	// PEP 397 -- Python launcher for Windows
 	// https://www.python.org/dev/peps/pep-0397/
 
-	// Check through python launcher whether python3 is
+#ifdef _WIN32
+	// Check through python launcher whether python 3 is
 	// installed on computer.
 	string command = python23_call("py -3");
+#else
+	// Check whether python3 in PATH is the right one.
+	string command = python23_call("python3");
+#endif // _WIN32
 	if (!command.empty())
 		return command;
 
+#ifndef _WIN32
+	// python3 does not exists, let us try to find python3.x in PATH
+	// the search is probably broader than required
+	// but we are trying hard to find a valid python binary
+	vector<string> const path = getEnvPath("PATH");
+	lyxerr << "Looking for python 3.x ...\n";
+	for (auto bin : path) {
+		QString const dir = toqstr(bin);
+		string const localdir = dir.toLocal8Bit().constData();
+		QDir qdir(dir);
+		qdir.setFilter(QDir::Files | QDir::Executable);
+		QStringList list = qdir.entryList(QStringList("python3*"));
+		for (auto bin2 : list) {
+			string const binary = "\"" + addName(localdir,
+				bin2.toLocal8Bit().constData()) + "\"";
+			command = python23_call(binary, true);
+			if (!command.empty())
+				return command;
+		}
+	}
+#endif // !_WIN32
+
 	// python 3 was not found let us look for python 2
+#ifdef _WIN32
 	command = python23_call("py -2");
+#else
+	command = python23_call("python2");
+#endif // _WIN32
 	if (!command.empty())
 		return command;
 
-	// python3 does not exists, let us try to find python3.x in PATH
+#ifdef _WIN32
+	// python launcher is not installed, let cmd auto check 
+	// PATH for a python.exe
+	command = python23_call("python");
+	if (!command.empty())
+		return command;
+
+	//failed, prepare to search PATH manually
+	vector<string> const path = getEnvPath("PATH");
+	lyxerr << "Manually looking for python in PATH ...\n";
+	QString const exeName = "python*";
+#else
+	// python2 does not exists, let us try to find python2.x in PATH
 	// the search is probably broader than required
 	// but we are trying hard to find a valid python binary
-	vector<string> const path = getEnvPath("PATH");
-	lyxerr << "Looking for python in PATH ...\n";
+	lyxerr << "Looking for python 2.x ...\n";
+	QString const exeName = "python2*";
+#endif // _WIN32
+
 	for (auto bin : path) {
 		QString const dir = toqstr(bin);
 		string const localdir = dir.toLocal8Bit().constData();
 		QDir qdir(dir);
 		qdir.setFilter(QDir::Files | QDir::Executable);
-		QStringList list = qdir.entryList(QStringList("python*"));
+		QStringList list = qdir.entryList(QStringList(exeName));
 		for (auto bin2 : list) {
 			string const binary = "\"" + addName(localdir,
 				bin2.toLocal8Bit().constData()) + "\"";