diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-06-03 16:54:24 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-06-03 16:54:24 -0700 |
| commit | ec2d40b8db3f078a8f8f7ab06dd1fcf07e907548 (patch) | |
| tree | 1ac0a00dd2f3fa8e9a4d101fc7c442cfffae0f4e /gr-atsc | |
| parent | bceb96b021bab0168e501e74ac38c7e31213b1a1 (diff) | |
uninstalled imports: Fixed gr-audio and gr-atsc.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-atsc/python/atsc/CMakeLists.txt (renamed from gr-atsc/python/CMakeLists.txt) | 21 | ||||
| -rw-r--r-- | gr-atsc/python/atsc/README (renamed from gr-atsc/python/README) | 0 | ||||
| -rw-r--r-- | gr-atsc/python/atsc/__init__.py (renamed from gr-atsc/python/__init__.py) | 8 | ||||
| -rw-r--r-- | gr-atsc/python/atsc/all_atsc.py (renamed from gr-atsc/python/all_atsc.py) | 0 | ||||
| -rw-r--r-- | gr-atsc/python/atsc/atsc_utils.py (renamed from gr-atsc/python/atsc_utils.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/btl-fsd.py (renamed from gr-atsc/python/btl-fsd.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/fpll.py (renamed from gr-atsc/python/fpll.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/interp.py (renamed from gr-atsc/python/interp.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/interp_short.py (renamed from gr-atsc/python/interp_short.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/qa_atsc.py (renamed from gr-atsc/python/qa_atsc.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/viterbi-out.py (renamed from gr-atsc/python/viterbi-out.py) | 0 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/xlate.py (renamed from gr-atsc/python/xlate.py) | 0 |
13 files changed, 18 insertions, 13 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index 9958edb36c..ffc74a0b4a 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -94,7 +94,7 @@ add_subdirectory(lib) add_subdirectory(include/gnuradio/atsc) if(ENABLE_PYTHON) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/atsc) endif(ENABLE_PYTHON) ######################################################################## diff --git a/gr-atsc/python/CMakeLists.txt b/gr-atsc/python/atsc/CMakeLists.txt index ddc4aba5b5..061f105572 100644 --- a/gr-atsc/python/CMakeLists.txt +++ b/gr-atsc/python/atsc/CMakeLists.txt @@ -51,18 +51,17 @@ install( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-atsc/python - ${CMAKE_BINARY_DIR}/gr-atsc/swig - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft) + set(GR_TEST_TARGET_DEPS "") + set(GR_TEST_LIBRARY_DIRS "") + set(GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gruel/src/python + ${CMAKE_BINARY_DIR}/gnuradio-runtime/python + ) -include(GrTest) -file(GLOB py_qa_test_files "qa_*.py") -foreach(py_qa_test_file ${py_qa_test_files}) + include(GrTest) + file(GLOB py_qa_test_files "qa_*.py") + foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) -endforeach(py_qa_test_file) + endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-atsc/python/README b/gr-atsc/python/atsc/README index 74d6ba134c..74d6ba134c 100644 --- a/gr-atsc/python/README +++ b/gr-atsc/python/atsc/README diff --git a/gr-atsc/python/__init__.py b/gr-atsc/python/atsc/__init__.py index e59fec399d..155baa2547 100644 --- a/gr-atsc/python/__init__.py +++ b/gr-atsc/python/atsc/__init__.py @@ -24,5 +24,11 @@ ''' Blocks and utilities for ATSC (Advanced Television Systems Committee) module. ''' +import os -from atsc_swig import * +try: + from atsc_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from atsc_swig import * diff --git a/gr-atsc/python/all_atsc.py b/gr-atsc/python/atsc/all_atsc.py index 7cac785149..7cac785149 100644 --- a/gr-atsc/python/all_atsc.py +++ b/gr-atsc/python/atsc/all_atsc.py diff --git a/gr-atsc/python/atsc_utils.py b/gr-atsc/python/atsc/atsc_utils.py index fc2465bed2..fc2465bed2 100644 --- a/gr-atsc/python/atsc_utils.py +++ b/gr-atsc/python/atsc/atsc_utils.py diff --git a/gr-atsc/python/btl-fsd.py b/gr-atsc/python/atsc/btl-fsd.py index 6bcab3dce3..6bcab3dce3 100755 --- a/gr-atsc/python/btl-fsd.py +++ b/gr-atsc/python/atsc/btl-fsd.py diff --git a/gr-atsc/python/fpll.py b/gr-atsc/python/atsc/fpll.py index dee81da13d..dee81da13d 100755 --- a/gr-atsc/python/fpll.py +++ b/gr-atsc/python/atsc/fpll.py diff --git a/gr-atsc/python/interp.py b/gr-atsc/python/atsc/interp.py index ee2d234892..ee2d234892 100755 --- a/gr-atsc/python/interp.py +++ b/gr-atsc/python/atsc/interp.py diff --git a/gr-atsc/python/interp_short.py b/gr-atsc/python/atsc/interp_short.py index d07b941c12..d07b941c12 100755 --- a/gr-atsc/python/interp_short.py +++ b/gr-atsc/python/atsc/interp_short.py diff --git a/gr-atsc/python/qa_atsc.py b/gr-atsc/python/atsc/qa_atsc.py index dc54051b77..dc54051b77 100755 --- a/gr-atsc/python/qa_atsc.py +++ b/gr-atsc/python/atsc/qa_atsc.py diff --git a/gr-atsc/python/viterbi-out.py b/gr-atsc/python/atsc/viterbi-out.py index cc60ffda42..cc60ffda42 100755 --- a/gr-atsc/python/viterbi-out.py +++ b/gr-atsc/python/atsc/viterbi-out.py diff --git a/gr-atsc/python/xlate.py b/gr-atsc/python/atsc/xlate.py index 3d049ac524..3d049ac524 100755 --- a/gr-atsc/python/xlate.py +++ b/gr-atsc/python/atsc/xlate.py |