MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

search for Python interpreters in %PATH% (PY-1593)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-09-14 14:05:33 +04:00
parent 4faa2ec2cd
commit 107fb0140a
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/IronPythonSdkFlavor.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class IronPythonSdkFlavor extends PythonSdkFlavor {
public static IronPythonSdkFlavor INSTANCE = new IronPythonSdkFlavor();
@Override
public List<String> suggestHomePaths() {
public Collection<String> suggestHomePaths() {
List<String> result = new ArrayList<String>();
String root = System.getenv("ProgramFiles(x86)");
if (root == null) {
python/src/com/jetbrains/python/sdk/MacPythonSdkFlavor.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
@@ -16,7 +17,7 @@ public class MacPythonSdkFlavor extends PythonSdkFlavor {
public static MacPythonSdkFlavor INSTANCE = new MacPythonSdkFlavor();
@Override
public List<String> suggestHomePaths() {
public Collection<String> suggestHomePaths() {
List<String> candidates = new ArrayList<String>();
collectPythonInstallations("/Library/Frameworks/Python.framework/Versions", candidates);
collectPythonInstallations("/System/Library/Frameworks/Python.framework/Versions", candidates);
python/src/com/jetbrains/python/sdk/PythonSdkFlavor.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
* @author yole
*/
public abstract class PythonSdkFlavor {
public List<String> suggestHomePaths() {
public Collection<String> suggestHomePaths() {
return Collections.emptyList();
}
python/src/com/jetbrains/python/sdk/UnixPythonSdkFlavor.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
@@ -16,7 +17,7 @@ public class UnixPythonSdkFlavor extends PythonSdkFlavor {
public static UnixPythonSdkFlavor INSTANCE = new UnixPythonSdkFlavor();
@Override
public List<String> suggestHomePaths() {
public Collection<String> suggestHomePaths() {
List<String> candidates = new ArrayList<String>();
VirtualFile rootDir = LocalFileSystem.getInstance().findFileByPath("/usr/bin");
if (rootDir != null) {
python/src/com/jetbrains/python/sdk/WinPythonSdkFlavor.java
+20 -6
View File
@@ -1,14 +1,13 @@
package com.jetbrains.python.sdk;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.encoding.EncodingManager;
import org.jetbrains.annotations.NonNls;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.io.File;
import java.util.*;
/**
* @author yole
@@ -22,14 +21,29 @@ public class WinPythonSdkFlavor extends PythonSdkFlavor {
}
@Override
public List<String> suggestHomePaths() {
List<String> candidates = new ArrayList<String>();
public Collection<String> suggestHomePaths() {
Set<String> candidates = new TreeSet<String>();
findSubdirInstallations(candidates, "C:\\", PYTHON_STR, "python.exe");
findSubdirInstallations(candidates, "C:\\Program Files\\", PYTHON_STR, "python.exe");
findSubdirInstallations(candidates, "C:\\", "jython", "jython.bat");
findCandidatesFromPath(candidates, "python.exe");
findCandidatesFromPath(candidates, "jython.bat");
return candidates;
}
private static void findCandidatesFromPath(Collection<String> candidates, String exeName) {
final String path = System.getenv("PATH");
for (String pathEntry : StringUtil.split(path, ";")) {
if (pathEntry.startsWith("\"") && pathEntry.endsWith("\"")) {
pathEntry = pathEntry.substring(1, pathEntry.length()-2);
}
File f = new File(pathEntry, exeName);
if (f.exists()) {
candidates.add(f.getPath());
}
}
}
private static void findSubdirInstallations(Collection<String> candidates, String rootDir, String dir_prefix, String exe_name) {
VirtualFile rootVDir = LocalFileSystem.getInstance().findFileByPath(rootDir);
if (rootVDir != null) {