diff options
author | Dave Andreoli <dave@gurumeditation.it> | 2018-03-16 20:00:49 +0100 |
---|---|---|
committer | Dave Andreoli <dave@gurumeditation.it> | 2018-03-16 20:00:49 +0100 |
commit | 81d15b7cd83ff6e29a82041ec50ebf52234cb7b6 (patch) | |
tree | 74dc0930f5bff2e2e7b2ae59c87f16d243bec60a /src/scripts | |
parent | 7784405ad91f5c6e89a72dd4bec938480a2da087 (diff) |
Pyolian: add support EOLIAN_SO_DIR env var
Thanks goes to @lauromoura for proposing this in D5840
Diffstat (limited to 'src/scripts')
-rw-r--r-- | src/scripts/pyolian/README.md | 4 | ||||
-rw-r--r-- | 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). | |||
25 | The only requirement is that **the source tree must be already built** (not | 25 | The only requirement is that **the source tree must be already built** (not |
26 | installed) because pyolian search the eolian .so/.dll inside the source tree. | 26 | installed) because pyolian search the eolian .so/.dll inside the source tree. |
27 | 27 | ||
28 | If you built the efl tree in a custom location (fe, you build out-of-tree) you | ||
29 | can tell pyolian where to find the built eolian .so files using the | ||
30 | `EOLIAN_SO_DIR` environment variable. | ||
31 | |||
28 | 32 | ||
29 | Command line usage | 33 | Command line usage |
30 | ================== | 34 | ================== |
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 | |||
11 | script_path = os.path.dirname(os.path.realpath(__file__)) | 11 | script_path = os.path.dirname(os.path.realpath(__file__)) |
12 | root_path = os.path.abspath(os.path.join(script_path, '..', '..', '..')) | 12 | root_path = os.path.abspath(os.path.join(script_path, '..', '..', '..')) |
13 | 13 | ||
14 | search_in = ( | 14 | search_in = [ |
15 | os.path.join(root_path, 'src', 'lib', 'eolian', '.libs'), | 15 | os.path.join(root_path, 'src', 'lib', 'eolian', '.libs'), |
16 | os.path.join(root_path, 'build', 'src', 'lib', 'eolian'), | 16 | os.path.join(root_path, 'build', 'src', 'lib', 'eolian'), |
17 | ) | 17 | ] |
18 | |||
19 | if 'EOLIAN_SO_DIR' in os.environ: | ||
20 | search_in.insert(0, os.environ['EOLIAN_SO_DIR']) | ||
18 | 21 | ||
19 | search_names = ('libeolian.so', 'eolian.dll') | 22 | search_names = ('libeolian.so', 'eolian.dll') |
20 | 23 | ||