diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-06-23 19:41:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-06-23 19:49:50 -0700 |
| commit | dc172e5dc3f42143a5de6c43bf4f9118c273986b (patch) | |
| tree | 4fd6cf8e5248f0ce723173a28d9ea5a38000d6b0 /gnuradio-core/src/lib/swig | |
| parent | 9965c0a8d09dc905f7eca2ed05ffdc4a4c7dcc64 (diff) | |
core: wip, first pass to remove filter/hier blocks after migration to gr-filter
* This commit removes all the blocks from src/lib/filter and src/lib/hier,
but leaves a couple stray files in src/lib/filter that won't be removed
until gr-analog is done
* The relevant QA code has been removed and the gnuradio-core directory
passes QA
* The effect on Python files in src/python/* has not been fully accounted
for
* Several top-level components outside gnuradio-core use header files,
blocks, or utility functions that have moved to gr-digital. These have
not been updated yet.
* Similarly, impact on python example files in other components as not
yet been accounted for.
Diffstat (limited to 'gnuradio-core/src/lib/swig')
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core.py | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 32 |
3 files changed, 2 insertions, 36 deletions
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index d3c381b4bc..bc2fadcecf 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -43,9 +43,9 @@ set(GR_SWIG_LIBRARIES gnuradio-core) # X86_64, g++'s resident set size was 650MB! # ---------------------------------------------------------------- -set(GR_SWIG_TARGET_DEPS gengen_generated filter_generated) +set(GR_SWIG_TARGET_DEPS gengen_generated) -foreach(what runtime general gengen filter io hier) +foreach(what runtime general gengen io) SET(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i) SET(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../${what} ${CMAKE_CURRENT_BINARY_DIR}/../${what}) GR_SWIG_MAKE(gnuradio_core_${what} gnuradio_core_${what}.i) diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.py b/gnuradio-core/src/lib/swig/gnuradio_core.py index 23de740778..1fd558a11b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core.py +++ b/gnuradio-core/src/lib/swig/gnuradio_core.py @@ -23,6 +23,4 @@ from gnuradio_core_runtime import * from gnuradio_core_general import * from gnuradio_core_gengen import * -from gnuradio_core_filter import * from gnuradio_core_io import * -from gnuradio_core_hier import * diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i deleted file mode 100644 index e9a44e54b9..0000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009,2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -%include "filter_swig_doc.i" - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_core_filter -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "filter.i" |