diff options
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/__init__.py | 1 | ||||
| -rw-r--r-- | gr-pager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-pager/python/pager/CMakeLists.txt (renamed from gr-pager/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-pager/python/pager/__init__.py (renamed from gr-pager/python/__init__.py) | 9 | ||||
| -rw-r--r-- | gr-pager/python/pager/flex_demod.py (renamed from gr-pager/python/flex_demod.py) | 0 | ||||
| -rw-r--r-- | gr-pager/python/pager/pager_utils.py (renamed from gr-pager/python/pager_utils.py) | 0 | ||||
| -rwxr-xr-x | gr-pager/python/pager/qa_pager.py (renamed from gr-pager/python/qa_pager.py) | 0 |
7 files changed, 10 insertions, 2 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py index b00d71e301..b894a08655 100644 --- a/gnuradio-core/src/python/gnuradio/__init__.py +++ b/gnuradio-core/src/python/gnuradio/__init__.py @@ -39,3 +39,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-wxgui', 'python')) #__path__.append(os.path.join(build_path, 'gr-atsc', 'python')) __path__.append(os.path.join(build_path, 'gr-noaa', 'python')) + __path__.append(os.path.join(build_path, 'gr-pager', 'python')) diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt index 4bd25af8c3..0fde9d4042 100644 --- a/gr-pager/CMakeLists.txt +++ b/gr-pager/CMakeLists.txt @@ -94,7 +94,7 @@ CPACK_COMPONENT("pager_swig" add_subdirectory(include/pager) add_subdirectory(lib) if(ENABLE_PYTHON) - add_subdirectory(python) + add_subdirectory(python/pager) add_subdirectory(swig) add_subdirectory(grc) add_subdirectory(apps) diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/pager/CMakeLists.txt index 30ac0364d7..30ac0364d7 100644 --- a/gr-pager/python/CMakeLists.txt +++ b/gr-pager/python/pager/CMakeLists.txt diff --git a/gr-pager/python/__init__.py b/gr-pager/python/pager/__init__.py index c395d4e458..ea4856fad6 100644 --- a/gr-pager/python/__init__.py +++ b/gr-pager/python/pager/__init__.py @@ -24,7 +24,14 @@ ''' The GNU Radio pager application. ''' +import os + +try: + from pager_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from pager_swig import * -from pager_swig import * from flex_demod import flex_demod from pager_utils import * diff --git a/gr-pager/python/flex_demod.py b/gr-pager/python/pager/flex_demod.py index 85797f3701..85797f3701 100644 --- a/gr-pager/python/flex_demod.py +++ b/gr-pager/python/pager/flex_demod.py diff --git a/gr-pager/python/pager_utils.py b/gr-pager/python/pager/pager_utils.py index e935c86d4b..e935c86d4b 100644 --- a/gr-pager/python/pager_utils.py +++ b/gr-pager/python/pager/pager_utils.py diff --git a/gr-pager/python/qa_pager.py b/gr-pager/python/pager/qa_pager.py index e07291966f..e07291966f 100755 --- a/gr-pager/python/qa_pager.py +++ b/gr-pager/python/pager/qa_pager.py |