|
 |
41b21e |
--- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java.orig 2013-11-05 17:35:28.000000000 +0200
|
|
|
41b21e |
+++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java 2013-11-11 11:01:42.396817944 +0200
|
|
|
41b21e |
@@ -25,9 +25,6 @@ import org.python.pydev.runners.SimpleRu
|
|
|
41b21e |
import org.python.pydev.shared_core.string.StringUtils;
|
|
|
41b21e |
import org.python.pydev.shared_core.utils.PlatformUtils;
|
|
|
41b21e |
|
|
|
41b21e |
-import at.jta.Key;
|
|
|
41b21e |
-import at.jta.Regor;
|
|
|
41b21e |
-
|
|
|
41b21e |
public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory {
|
|
|
41b21e |
|
|
|
dc00b4 |
@Override
|
|
|
41b21e |
@@ -63,46 +60,6 @@ public class PythonInterpreterProviderFa
|
|
|
41b21e |
} else {
|
|
|
41b21e |
// On windows we can try to see the installed versions...
|
|
|
41b21e |
List<String> foundVersions = new ArrayList<String>();
|
|
|
41b21e |
- try {
|
|
|
41b21e |
- Regor regor = new Regor();
|
|
|
41b21e |
-
|
|
|
41b21e |
- // The structure for Python is something as
|
|
|
41b21e |
- // Software\\Python\\PythonCore\\2.6\\InstallPath
|
|
|
41b21e |
- for (Key root : new Key[] { Regor.HKEY_LOCAL_MACHINE, Regor.HKEY_CURRENT_USER }) {
|
|
|
41b21e |
- Key key = regor.openKey(root, "Software\\Python\\PythonCore", Regor.KEY_READ);
|
|
|
41b21e |
- if (key != null) {
|
|
|
41b21e |
- try {
|
|
|
41b21e |
- @SuppressWarnings("rawtypes")
|
|
|
41b21e |
- List l = regor.listKeys(key);
|
|
|
41b21e |
- for (Object o : l) {
|
|
|
41b21e |
- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ);
|
|
|
41b21e |
- if (openKey != null) {
|
|
|
41b21e |
- try {
|
|
|
41b21e |
- byte buf[] = regor.readValue(openKey, "");
|
|
|
41b21e |
- if (buf != null) {
|
|
|
41b21e |
- String parseValue = Regor.parseValue(buf);
|
|
|
41b21e |
- // Ok, this should be the directory
|
|
|
41b21e |
- // where it's installed, try to find
|
|
|
41b21e |
- // a 'python.exe' there...
|
|
|
41b21e |
- File file = new File(parseValue, "python.exe");
|
|
|
41b21e |
- if (file.isFile()) {
|
|
|
41b21e |
- foundVersions.add(file.toString());
|
|
|
41b21e |
- }
|
|
|
41b21e |
- }
|
|
|
41b21e |
- } finally {
|
|
|
41b21e |
- regor.closeKey(openKey);
|
|
|
41b21e |
- }
|
|
|
41b21e |
- }
|
|
|
41b21e |
- }
|
|
|
41b21e |
- } finally {
|
|
|
41b21e |
- regor.closeKey(key);
|
|
|
41b21e |
- }
|
|
|
41b21e |
- }
|
|
|
41b21e |
- }
|
|
|
41b21e |
-
|
|
|
41b21e |
- } catch (Throwable e) {
|
|
|
41b21e |
- Log.log(e);
|
|
|
41b21e |
- }
|
|
|
41b21e |
if (foundVersions.size() > 0) {
|
|
|
41b21e |
return AlreadyInstalledInterpreterProvider.create("python",
|
|
|
41b21e |
foundVersions.toArray(new String[foundVersions.size()]));
|
|
|
41b21e |
--- plugins/org.python.pydev/build.properties.orig 2014-07-31 14:13:39.439344020 +0100
|
|
|
41b21e |
+++ plugins/org.python.pydev/build.properties 2014-07-31 14:13:57.866059652 +0100
|
|
|
41b21e |
@@ -8,10 +8,8 @@
|
|
|
41b21e |
about.mappings,\
|
|
|
41b21e |
pydev.png,\
|
|
|
41b21e |
plugin.properties,\
|
|
|
41b21e |
- LICENSE.txt,\
|
|
|
41b21e |
- libs/,\
|
|
|
41b21e |
- libs/WinRegistry-4.5.jar,\
|
|
|
41b21e |
- css/
|
|
|
41b21e |
+ LICENSE.txt,\
|
|
|
41b21e |
+ css/
|
|
|
41b21e |
jars.compile.order = pydev.jar
|
|
|
41b21e |
source.pydev.jar = src/,\
|
|
|
41b21e |
src_navigator/,\
|