davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=81d15b7cd83ff6e29a82041ec50ebf52234cb7b6
commit 81d15b7cd83ff6e29a82041ec50ebf52234cb7b6 Author: Dave Andreoli <d...@gurumeditation.it> Date: Fri Mar 16 20:00:49 2018 +0100 Pyolian: add support EOLIAN_SO_DIR env var Thanks goes to @lauromoura for proposing this in D5840 --- src/scripts/pyolian/README.md | 4 ++++ src/scripts/pyolian/eolian_lib.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/scripts/pyolian/README.md b/src/scripts/pyolian/README.md index f803077c01..9ec4f20b82 100644 --- a/src/scripts/pyolian/README.md +++ b/src/scripts/pyolian/README.md @@ -25,6 +25,10 @@ tree, usually at efl compilation time (before the install step). The only requirement is that **the source tree must be already built** (not installed) because pyolian search the eolian .so/.dll inside the source tree. +If you built the efl tree in a custom location (fe, you build out-of-tree) you +can tell pyolian where to find the built eolian .so files using the +`EOLIAN_SO_DIR` environment variable. + Command line usage ================== diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py index 99d862a8de..4b792657d2 100644 --- a/src/scripts/pyolian/eolian_lib.py +++ b/src/scripts/pyolian/eolian_lib.py @@ -11,10 +11,13 @@ import os script_path = os.path.dirname(os.path.realpath(__file__)) root_path = os.path.abspath(os.path.join(script_path, '..', '..', '..')) -search_in = ( +search_in = [ os.path.join(root_path, 'src', 'lib', 'eolian', '.libs'), os.path.join(root_path, 'build', 'src', 'lib', 'eolian'), -) +] + +if 'EOLIAN_SO_DIR' in os.environ: + search_in.insert(0, os.environ['EOLIAN_SO_DIR']) search_names = ('libeolian.so', 'eolian.dll') --