diff options
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/__init__.py | 1 | ||||
| -rw-r--r-- | gr-fcd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fcd/python/fcd/CMakeLists.txt (renamed from gr-fcd/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-fcd/python/fcd/__init__.py (renamed from gr-fcd/python/__init__.py) | 8 | ||||
| -rwxr-xr-x | gr-fcd/python/fcd/qa_fcd.py (renamed from gr-fcd/python/qa_fcd.py) | 0 | ||||
| -rw-r--r-- | gr-fcd/python/fcd/run_tests.in (renamed from gr-fcd/python/run_tests.in) | 0 |
6 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 7f8015f9f4..4fe55baa04 100644 --- a/gnuradio-core/src/python/gnuradio/__init__.py +++ b/gnuradio-core/src/python/gnuradio/__init__.py @@ -42,3 +42,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-pager', 'python')) __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')) diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt index 810e79e6eb..8c15c8a17e 100644 --- a/gr-fcd/CMakeLists.txt +++ b/gr-fcd/CMakeLists.txt @@ -107,7 +107,7 @@ add_subdirectory(include/fcd) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/fcd) add_subdirectory(grc) add_subdirectory(examples/grc) endif(ENABLE_PYTHON) diff --git a/gr-fcd/python/CMakeLists.txt b/gr-fcd/python/fcd/CMakeLists.txt index 39ec5efe9e..39ec5efe9e 100644 --- a/gr-fcd/python/CMakeLists.txt +++ b/gr-fcd/python/fcd/CMakeLists.txt diff --git a/gr-fcd/python/__init__.py b/gr-fcd/python/fcd/__init__.py index daf9c890de..0d5f5ca5dd 100644 --- a/gr-fcd/python/__init__.py +++ b/gr-fcd/python/fcd/__init__.py @@ -23,6 +23,12 @@ This is the gr-fcd package. This package provides a GNU Radio source block for the FunCube Dongle hardware. ''' +import os -from fcd_swig import * +try: + from fcd_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from fcd_swig import * diff --git a/gr-fcd/python/qa_fcd.py b/gr-fcd/python/fcd/qa_fcd.py index 0993cab425..0993cab425 100755 --- a/gr-fcd/python/qa_fcd.py +++ b/gr-fcd/python/fcd/qa_fcd.py diff --git a/gr-fcd/python/run_tests.in b/gr-fcd/python/fcd/run_tests.in index 4d28c1522d..4d28c1522d 100644 --- a/gr-fcd/python/run_tests.in +++ b/gr-fcd/python/fcd/run_tests.in |