diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-08 21:07:27 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-08 21:07:27 -0700 |
| commit | 2405dbb72fdf56ee4e7585e7109fb7c057e2a2f0 (patch) | |
| tree | 16bb39e35a5d11a86e2c161d3b7dcc79f1dca04c | |
| parent | f7e3daaf4939cddbc6dc3bd42893168d6cff49fd (diff) | |
comedi: Enabling uninstalled python imports.
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/__init__.py | 1 | ||||
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/CMakeLists.txt (renamed from gr-comedi/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/__init__.py (renamed from gr-comedi/python/__init__.py) | 8 | ||||
| -rwxr-xr-x | gr-comedi/python/comedi/qa_comedi.py (renamed from gr-comedi/python/qa_comedi.py) | 0 |
5 files changed, 9 insertions, 2 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py index 4fe55baa04..de9f20f71b 100644 --- a/gnuradio-core/src/python/gnuradio/__init__.py +++ b/gnuradio-core/src/python/gnuradio/__init__.py @@ -43,3 +43,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-video-sdl', 'python')) __path__.append(os.path.join(build_path, 'gr-vocoder', 'python')) __path__.append(os.path.join(build_path, 'gr-fcd', 'python')) + __path__.append(os.path.join(build_path, 'gr-comedi', 'python')) diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index f0ddff9d50..d038dc4a4f 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -92,7 +92,7 @@ add_subdirectory(include/comedi) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/comedi) endif(ENABLE_PYTHON) ######################################################################## diff --git a/gr-comedi/python/CMakeLists.txt b/gr-comedi/python/comedi/CMakeLists.txt index d8c9fa5d9f..d8c9fa5d9f 100644 --- a/gr-comedi/python/CMakeLists.txt +++ b/gr-comedi/python/comedi/CMakeLists.txt diff --git a/gr-comedi/python/__init__.py b/gr-comedi/python/comedi/__init__.py index afe7a161f4..939889dccb 100644 --- a/gr-comedi/python/__init__.py +++ b/gr-comedi/python/comedi/__init__.py @@ -23,5 +23,11 @@ Blocks and utilities for COMEDI devices ''' # The presence of this file turns this directory into a Python package +import os -from comedi_swig import * +try: + from comedi_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from comedi_swig import * diff --git a/gr-comedi/python/qa_comedi.py b/gr-comedi/python/comedi/qa_comedi.py index 573a2193f7..573a2193f7 100755 --- a/gr-comedi/python/qa_comedi.py +++ b/gr-comedi/python/comedi/qa_comedi.py |