diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-11 13:06:21 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-11 13:06:21 +0400 |
| commit | e7c9a46e652b01906be54a66de205d466c61a664 (patch) | |
| tree | e8cb6ae7d880ecb280477a80e4e9c94b5689019c | |
| parent | c7397a9e0ff65c18cb8c74e30491670fdc043cf6 (diff) | |
| parent | e047f99f6df7b5c801102c03f903d4dd722b2989 (diff) | |
Merge branch 'master' into newresolver
| -rw-r--r-- | extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs | 9 | ||||
| -rw-r--r-- | extras/ValaBinding/Makefile.am | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs b/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs index a797280d16..194755229c 100644 --- a/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs +++ b/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs @@ -109,6 +109,13 @@ namespace PyBinding // next preferred type. try { + return new Python27Runtime () { + Path = Which ("python2.7") + }; + } + catch {} + + try { return new Python26Runtime () { Path = Which ("python2.6") }; @@ -129,8 +136,10 @@ namespace PyBinding public static string FindPreferredPython () { + try { return Which ("python2.7"); } catch {} try { return Which ("python2.6"); } catch {} try { return Which ("python2.5"); } catch {} + try { return Which ("python2"); } catch {} try { return Which ("python"); } catch {} throw new FileNotFoundException ("Could not locate python executable"); diff --git a/extras/ValaBinding/Makefile.am b/extras/ValaBinding/Makefile.am index 03500e5c0b..eb50d3c406 100644 --- a/extras/ValaBinding/Makefile.am +++ b/extras/ValaBinding/Makefile.am @@ -96,7 +96,7 @@ valabindinglib_DATA = $(ASSEMBLY) $(ASSEMBLY_CONFIG) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb -EXTRA_DIST = $(FILES) $(RES) +EXTRA_DIST = $(FILES) $(RES) $(ASSEMBLY_CONFIG) # include $(top_srcdir)/Makefile.include |