diff options
33 files changed, 13 insertions, 1052 deletions
diff --git a/cmake/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake index 2e9e78ee11..18836d871b 100644 --- a/cmake/Packaging/Fedora-15.cmake +++ b/cmake/Packaging/Fedora-15.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") diff --git a/cmake/Packaging/Fedora-16.cmake b/cmake/Packaging/Fedora-16.cmake index 2e9e78ee11..18836d871b 100644 --- a/cmake/Packaging/Fedora-16.cmake +++ b/cmake/Packaging/Fedora-16.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") diff --git a/cmake/Packaging/Fedora-17.cmake b/cmake/Packaging/Fedora-17.cmake index 2e9e78ee11..18836d871b 100644 --- a/cmake/Packaging/Fedora-17.cmake +++ b/cmake/Packaging/Fedora-17.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") diff --git a/cmake/Packaging/Fedora-18.cmake b/cmake/Packaging/Fedora-18.cmake index 2e9e78ee11..18836d871b 100644 --- a/cmake/Packaging/Fedora-18.cmake +++ b/cmake/Packaging/Fedora-18.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") diff --git a/cmake/Packaging/Ubuntu-10.04.cmake b/cmake/Packaging/Ubuntu-10.04.cmake index 3320073c6b..c297a50a4c 100644 --- a/cmake/Packaging/Ubuntu-10.04.cmake +++ b/cmake/Packaging/Ubuntu-10.04.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/cmake/Packaging/Ubuntu-10.10.cmake b/cmake/Packaging/Ubuntu-10.10.cmake index 3320073c6b..c297a50a4c 100644 --- a/cmake/Packaging/Ubuntu-10.10.cmake +++ b/cmake/Packaging/Ubuntu-10.10.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/cmake/Packaging/Ubuntu-11.04.cmake b/cmake/Packaging/Ubuntu-11.04.cmake index c166bcf427..d08ae1d2c5 100644 --- a/cmake/Packaging/Ubuntu-11.04.cmake +++ b/cmake/Packaging/Ubuntu-11.04.cmake @@ -1,6 +1,4 @@ #set the debian package dependencies (parsed by our deb component maker) -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/cmake/Packaging/Ubuntu-11.10.cmake b/cmake/Packaging/Ubuntu-11.10.cmake index 702ce574f3..d27cdae532 100644 --- a/cmake/Packaging/Ubuntu-11.10.cmake +++ b/cmake/Packaging/Ubuntu-11.10.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/cmake/Packaging/Ubuntu-12.04.cmake b/cmake/Packaging/Ubuntu-12.04.cmake index 702ce574f3..d27cdae532 100644 --- a/cmake/Packaging/Ubuntu-12.04.cmake +++ b/cmake/Packaging/Ubuntu-12.04.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/cmake/Packaging/Ubuntu-12.10.cmake b/cmake/Packaging/Ubuntu-12.10.cmake index 702ce574f3..d27cdae532 100644 --- a/cmake/Packaging/Ubuntu-12.10.cmake +++ b/cmake/Packaging/Ubuntu-12.10.cmake @@ -1,5 +1,3 @@ -SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") -SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") diff --git a/docs/doxygen/other/extra_pages.dox b/docs/doxygen/other/extra_pages.dox index 94c741864d..8d9b69a87b 100644 --- a/docs/doxygen/other/extra_pages.dox +++ b/docs/doxygen/other/extra_pages.dox @@ -122,11 +122,11 @@ built or installed. The -DENABLE_DEFAULT=False can be used to disable all components. Individual components can then be selectively turned back -on. For example, just buidling the Volk and Gruel libraries can be +on. For example, just buidling the Volk library can be done with this: \code -cmake -DENABLE_DEFAULT=Off -DENABLE_VOLK=True -DENABLE_GRUEL=True <srcdir> +cmake -DENABLE_DEFAULT=Off -DENABLE_VOLK=True <srcdir> \endcode diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 1767920b5d..5e7e0a1800 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -214,7 +214,6 @@ endif(TRY_SHM_VMCIRCBUF) add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources}) target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") -#set_target_properties(gnuradio-runtime PROPERTIES LINK_INTERFACE_LIBRARIES "gruel") add_dependencies(gnuradio-runtime runtime_generated_includes @@ -241,6 +240,8 @@ list(APPEND test_gnuradio_runtime_sources qa_gr_vmcircbuf.cc qa_runtime.cc qa_sincos.cc + pmt/qa_pmt.cc + pmt/qa_pmt_prims.cc ) include_directories(${CPPUNIT_INCLUDE_DIRS}) diff --git a/gnuradio-runtime/lib/pmt/qa_pmt.cc b/gnuradio-runtime/lib/pmt/qa_pmt.cc index 27c617e747..a87f97e570 100644 --- a/gnuradio-runtime/lib/pmt/qa_pmt.cc +++ b/gnuradio-runtime/lib/pmt/qa_pmt.cc @@ -29,12 +29,12 @@ #include <qa_pmt_unv.h> CppUnit::TestSuite * -qa_pmt::suite () +qa_pmt::suite() { - CppUnit::TestSuite *s = new CppUnit::TestSuite ("pmt"); + CppUnit::TestSuite *s = new CppUnit::TestSuite("pmt"); - s->addTest (qa_pmt_prims::suite ()); - s->addTest (qa_pmt_unv::suite ()); + s->addTest(qa_pmt_prims::suite()); + s->addTest(qa_pmt_unv::suite()); return s; } diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc index 783cbebc0b..daafca20cd 100644 --- a/gnuradio-runtime/lib/test_runtime.cc +++ b/gnuradio-runtime/lib/test_runtime.cc @@ -29,6 +29,7 @@ #include <gr_unittests.h> #include <qa_runtime.h> +#include <pmt/qa_pmt.h> int main (int argc, char **argv) @@ -37,10 +38,11 @@ main (int argc, char **argv) std::ofstream xmlfile(get_unittest_path("gnuradio_core_runtime.xml").c_str()); CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - runner.addTest (qa_runtime::suite ()); + runner.addTest(qa_runtime::suite()); + runner.addTest(qa_pmt::suite()); runner.setOutputter(xmlout); - bool was_successful = runner.run ("", false); + bool was_successful = runner.run("", false); return was_successful ? 0 : 1; } diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt deleted file mode 100644 index cc1e5a439d..0000000000 --- a/gr-comedi/src/CMakeLists.txt +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2011 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${GR_COMEDI_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ${COMEDI_INCLUDE_DIRS} -) - -link_directories( - ${Boost_LIBRARY_DIRS} - ${COMEDI_LIBRARY_DIRS} -) - -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - -######################################################################## -# Setup library -######################################################################## -list(APPEND gr_comedi_sources - comedi_sink_s.cc - comedi_source_s.cc - gri_comedi.cc -) - -list(APPEND comedi_libs - gnuradio-runtime - ${Boost_LIBRARIES} - ${COMEDI_LIBRARIES} - ${LOG4CPP_LIBRARIES} -) - -add_library(gnuradio-comedi SHARED ${gr_comedi_sources}) -target_link_libraries(gnuradio-comedi ${comedi_libs}) -GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel") - -######################################################################## -# Install public header files -######################################################################## -install(FILES - comedi_sink_s.h - comedi_source_s.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "comedi_devel" -) - -######################################################################## -# Setup swig generation -######################################################################## -if(ENABLE_PYTHON) -include(GrPython) -include(GrSwig) - -set(GR_SWIG_INCLUDE_DIRS - ${GR_COMEDI_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) - -set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) - -set(GR_SWIG_LIBRARIES gnuradio-comedi) - -GR_SWIG_MAKE(comedi comedi.i) - -GR_SWIG_INSTALL( - TARGETS comedi - DESTINATION ${GR_PYTHON_DIR}/gnuradio - COMPONENT "comedi_python" -) - -install( - FILES comedi.i - ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "comedi_swig" -) - -endif(ENABLE_PYTHON) - -######################################################################## -# Handle the unit tests -######################################################################## -if(ENABLE_TESTING AND ENABLE_PYTHON) - -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-comedi/src -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi) - -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) -endif(ENABLE_TESTING AND ENABLE_PYTHON) diff --git a/gr-trellis/src/lib/gnuradio-trellis.rc.in b/gr-trellis/lib/gnuradio-trellis.rc.in index db9f187947..db9f187947 100644 --- a/gr-trellis/src/lib/gnuradio-trellis.rc.in +++ b/gr-trellis/lib/gnuradio-trellis.rc.in diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt deleted file mode 100644 index 07d0851105..0000000000 --- a/gr-trellis/src/lib/CMakeLists.txt +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 2011-2013 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -include(GrPython) - -######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${GR_TRELLIS_INCLUDE_DIRS} - ${GR_DIGITAL_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) - -link_directories(${Boost_LIBRARY_DIRS}) - -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - -######################################################################## -# generate the python helper script which calls into the build utils -######################################################################## -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py " -#!${PYTHON_EXECUTABLE} - -import sys, os, re -sys.path.append('${GR_RUNTIME_PYTHONPATH}') -sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}') -os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}' -os.chdir('${CMAKE_CURRENT_BINARY_DIR}') - -if __name__ == '__main__': - import build_utils, generate_trellis - root, inp = sys.argv[1:3] - for sig in sys.argv[3:]: - name = re.sub ('X+', sig, root) - d = generate_trellis.standard_dict(name, sig) - build_utils.expand_template(d, inp) - -") - -######################################################################## -# generation helper macro to generate various files from template -######################################################################## -macro(expand_h_cc_i root) - - foreach(ext h cc i) - #make a list of all the generated files - unset(expanded_files_${ext}) - foreach(sig ${ARGN}) - string(REGEX REPLACE "X+" ${sig} name ${root}) - list(APPEND expanded_files_${ext} ${CMAKE_CURRENT_BINARY_DIR}/${name}.${ext}) - endforeach(sig) - - #create a command to generate the files - add_custom_command( - OUTPUT ${expanded_files_${ext}} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.${ext}.t - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py - ${root} ${root}.${ext}.t ${ARGN} - ) - endforeach(ext) - - #make source files depends on headers to force generation - set_source_files_properties(${expanded_files_cc} - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" - ) - - #install rules for the generated cc, h, and i files - list(APPEND generated_trellis_sources ${expanded_files_cc}) - list(APPEND generated_trellis_includes ${expanded_files_h}) - list(APPEND generated_trellis_swigs ${expanded_files_i}) - -endmacro(expand_h_cc_i) - -######################################################################## -# Invoke macro to generate various sources -######################################################################## -expand_h_cc_i(trellis_encoder_XX bb bs bi ss si ii) -expand_h_cc_i(trellis_sccc_encoder_XX bb bs bi ss si ii) -expand_h_cc_i(trellis_pccc_encoder_XX bb bs bi ss si ii) -expand_h_cc_i(trellis_metrics_X s i f c) -expand_h_cc_i(trellis_viterbi_X b s i) -expand_h_cc_i(trellis_viterbi_combined_XX sb ss si ib is ii fb fs fi cb cs ci) -expand_h_cc_i(trellis_sccc_decoder_X b s i) -expand_h_cc_i(trellis_sccc_decoder_combined_XX fb fs fi cb cs ci) -expand_h_cc_i(trellis_pccc_decoder_X b s i) -expand_h_cc_i(trellis_pccc_decoder_combined_XX fb fs fi cb cs ci) - -######################################################################## -# Create the master trellis swig include files -######################################################################## -set(generated_index ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i.in) -file(WRITE ${generated_index} " -// -// This file is machine generated. All edits will be overwritten -// -") - -file(APPEND ${generated_index} "%{\n") -foreach(swig_file ${generated_trellis_swigs}) - get_filename_component(name ${swig_file} NAME_WE) - file(APPEND ${generated_index} "#include<${name}.h>\n") -endforeach(swig_file) -file(APPEND ${generated_index} "%}\n") - -foreach(swig_file ${generated_trellis_swigs}) - get_filename_component(name ${swig_file} NAME) - file(APPEND ${generated_index} "%include<${name}>\n") -endforeach(swig_file) - -execute_process( - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${generated_index} ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i -) - -######################################################################## -# Setup library -######################################################################## -list(APPEND gr_trellis_sources - fsm.cc - quicksort_index.cc - base.cc - interleaver.cc - calc_metric.cc - core_algorithms.cc - trellis_permutation.cc - trellis_siso_f.cc - trellis_siso_combined_f.cc - trellis_constellation_metrics_cf.cc - ${generated_trellis_sources} -) - -#Add Windows DLL resource file if using MSVC -if(MSVC) - include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) - - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-trellis.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc - @ONLY) - - list(APPEND gr_trellis_sources - ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc - ) -endif(MSVC) - -list(APPEND trellis_libs - gnuradio-runtime - ${Boost_LIBRARIES} - ${LOG4CPP_LIBRARIES} -) - -add_library(gnuradio-trellis SHARED ${gr_trellis_sources}) -target_link_libraries(gnuradio-trellis ${trellis_libs}) -GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel") - -######################################################################## -# Handle the generated sources + a few non-generated ones -######################################################################## -install(FILES - ${generated_trellis_includes} - trellis_api.h - fsm.h - quicksort_index.h - base.h - interleaver.h - calc_metric.h - core_algorithms.h - trellis_permutation.h - siso_type.h - trellis_siso_f.h - trellis_siso_combined_f.h - trellis_constellation_metrics_cf.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "trellis_devel" -) - -if(ENABLE_PYTHON) - install(FILES - trellis.i - ${generated_trellis_swigs} - fsm.i - interleaver.i - trellis_permutation.i - trellis_siso_f.i - trellis_siso_combined_f.i - trellis_constellation_metrics_cf.i - ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i - ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "trellis_swig" - ) - -######################################################################## -# Setup swig generation -######################################################################## -include(GrPython) -include(GrSwig) - -set(GR_SWIG_SOURCE_DEPS - ${generated_trellis_includes} - ${generated_trellis_swigs} -) -set(GR_SWIG_INCLUDE_DIRS - ${GR_TRELLIS_INCLUDE_DIRS} - ${GR_DIGITAL_SWIG_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) - -set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - -set(GR_SWIG_LIBRARIES gnuradio-trellis) -GR_SWIG_MAKE(trellis trellis.i) - -GR_SWIG_INSTALL( - TARGETS trellis - DESTINATION ${GR_PYTHON_DIR}/gnuradio - COMPONENT "trellis_python" -) - -endif(ENABLE_PYTHON) diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index f68db5c475..33f67c0442 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -83,7 +83,6 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) ######################################################################## # Find gnuradio build dependencies ######################################################################## -find_package(Gruel) find_package(GnuradioRuntime) find_package(CppUnit) @@ -101,14 +100,12 @@ endif() include_directories( ${CMAKE_SOURCE_DIR}/include ${Boost_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ) link_directories( ${Boost_LIBRARY_DIRS} - ${GRUEL_LIBRARY_DIRS} ${CPPUNIT_LIBRARY_DIRS} ${GNURADIO_RUNTIME_LIBRARY_DIRS} ) diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/FindGruel.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/FindGruel.cmake deleted file mode 100644 index 58dff70444..0000000000 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/FindGruel.cmake +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL gruel) - -FIND_PATH( - GRUEL_INCLUDE_DIRS - NAMES gruel/attributes.h - HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDEDIR} - PATHS /usr/local/include - /usr/include -) - -FIND_LIBRARY( - GRUEL_LIBRARIES - NAMES gruel - HINTS $ENV{GRUEL_DIR}/lib - ${PC_GRUEL_LIBDIR} - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GRUEL DEFAULT_MSG GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) -MARK_AS_ADVANCED(GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) diff --git a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt index fe57ba139b..312594149c 100644 --- a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt @@ -29,7 +29,7 @@ list(APPEND howto_sources ) add_library(gnuradio-howto SHARED ${howto_sources}) -target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) +target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) set_target_properties(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EXPORTS") ######################################################################## diff --git a/gr-utils/python/modtool/modtool_info.py b/gr-utils/python/modtool/modtool_info.py index 478dbebb7a..0f0f66f3fd 100644 --- a/gr-utils/python/modtool/modtool_info.py +++ b/gr-utils/python/modtool/modtool_info.py @@ -129,8 +129,6 @@ class ModToolInfo(ModTool): for line in cmakecache_fid: if line.find('GNURADIO_RUNTIME_INCLUDE_DIRS:%s' % path_or_internal) != -1: inc_dirs += line.replace('GNURADIO_RUNTIME_INCLUDE_DIRS:%s=' % path_or_internal, '').strip().split(';') - if line.find('GRUEL_INCLUDE_DIRS:%s' % path_or_internal) != -1: - inc_dirs += line.replace('GRUEL_INCLUDE_DIRS:%s=' % path_or_internal, '').strip().split(';') except IOError: pass if len(inc_dirs) == 0 and self.options.suggested_dirs is not None: diff --git a/gr-video-sdl/src/gnuradio-video-sdl.rc.in b/gr-video-sdl/lib/gnuradio-video-sdl.rc.in index c876b0f08a..c876b0f08a 100644 --- a/gr-video-sdl/src/gnuradio-video-sdl.rc.in +++ b/gr-video-sdl/lib/gnuradio-video-sdl.rc.in diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt deleted file mode 100644 index ae0a0d98ca..0000000000 --- a/gr-video-sdl/src/CMakeLists.txt +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2011-2013 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${GR_VIDEO_SDL_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} - ${SDL_INCLUDE_DIR} -) - -link_directories(${Boost_LIBRARY_DIRS}) - -######################################################################## -# Setup library -######################################################################## -list(APPEND gr_video_sdl_sources - video_sdl_sink_uc.cc - video_sdl_sink_s.cc -) - -#Add Windows DLL resource file if using MSVC -if(MSVC) - include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) - - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc - @ONLY) - - list(APPEND gr_uhd_sources - ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc - ) -endif(MSVC) - -list(APPEND video_sdl_libs - gnuradio-runtime - ${Boost_LIBRARIES} - ${SDL_LIBRARY} - ${LOG4CPP_LIBRARIES} -) - -add_library(gnuradio-video-sdl SHARED ${gr_video_sdl_sources}) -target_link_libraries(gnuradio-video-sdl ${video_sdl_libs}) -GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel") - -######################################################################## -# Install public header files -######################################################################## -install(FILES - video_sdl_api.h - video_sdl_sink_uc.h - video_sdl_sink_s.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "video_sdl_devel" -) - -######################################################################## -# Setup swig generation -######################################################################## -if(ENABLE_PYTHON) -include(GrPython) -include(GrSwig) - -set(GR_SWIG_INCLUDE_DIRS - ${GR_COMEDI_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) - -set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) - -set(GR_SWIG_LIBRARIES gnuradio-video-sdl) - -GR_SWIG_MAKE(video_sdl video_sdl.i) - -GR_SWIG_INSTALL( - TARGETS video_sdl - DESTINATION ${GR_PYTHON_DIR}/gnuradio - COMPONENT "video_sdl_python" -) - -install( - FILES video_sdl.i - ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "video_sdl_swig" -) - -endif(ENABLE_PYTHON) - -######################################################################## -# Handle the unit tests -######################################################################## -if(ENABLE_TESTING AND ENABLE_PYTHON) - -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-video-sdl/src -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl) - -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) -endif(ENABLE_TESTING AND ENABLE_PYTHON) diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt deleted file mode 100644 index 377add8f98..0000000000 --- a/gruel/CMakeLists.txt +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2010-2011 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Setup dependencies -######################################################################## -include(GrBoost) - -include(GrPython) #used for code generation - -######################################################################## -# Register component -######################################################################## -include(GrComponent) -GR_REGISTER_COMPONENT("gruel" ENABLE_GRUEL - Boost_FOUND - PYTHONINTERP_FOUND -) - -include(GrMiscUtils) -GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS - ${CMAKE_CURRENT_SOURCE_DIR}/src/include - ${CMAKE_CURRENT_BINARY_DIR}/src/include - ${CMAKE_CURRENT_SOURCE_DIR}/src/swig - ${CMAKE_CURRENT_BINARY_DIR}/src/swig -) - -######################################################################## -# Begin conditional configuration -######################################################################## -if(ENABLE_GRUEL) - -######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_GRUEL_DESCRIPTION "GNU Radio Utility Etcetera Library") - -CPACK_COMPONENT("gruel_runtime" - GROUP "Gruel" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" -) - -CPACK_COMPONENT("gruel_devel" - GROUP "Gruel" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" -) - -CPACK_COMPONENT("gruel_python" - GROUP "Gruel" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "gruel_runtime" -) - -CPACK_COMPONENT("gruel_swig" - GROUP "Gruel" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "gruel_python;gruel_devel" -) - -######################################################################## -# Add subdirectories -######################################################################## -add_subdirectory(src/include/gruel) -add_subdirectory(src/lib) -if(ENABLE_PYTHON) - add_subdirectory(src/swig) -endif(ENABLE_PYTHON) - -######################################################################## -# Create Pkg Config File -######################################################################## -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/gruel.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc -@ONLY) - -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc - DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "gruel_devel" -) - -endif(ENABLE_GRUEL) diff --git a/gruel/README b/gruel/README deleted file mode 100644 index 90dc4eeb42..0000000000 --- a/gruel/README +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2008 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -The GNU Radio Utility Etcetera Library, a collection of low-level routines -to avoid dependencies on the full GNU Radio core or other libraries. - -Over time, some code from libgnuradio-core and libpmt will migrate -here, to avoid duplication of code and simplify dependencies. - -By design, this library will not have dependencies on any other part -of GNU Radio, but may have external dependencies such as Boost. diff --git a/gruel/gruel.pc.in b/gruel/gruel.pc.in deleted file mode 100644 index 7f3f821fe2..0000000000 --- a/gruel/gruel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: gruel -Description: The GNU Radio Utility Etcetera Library -Requires: -Version: @LIBVER@ -Libs: -L${libdir} -lgruel -Cflags: -I${includedir} diff --git a/gruel/src/include/gruel/CMakeLists.txt b/gruel/src/include/gruel/CMakeLists.txt deleted file mode 100644 index f84c23bb50..0000000000 --- a/gruel/src/include/gruel/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2010-2012 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Install the headers -######################################################################## -install(FILES - api.h - attributes.h - high_res_timer.h - msg_accepter.h - msg_accepter_msgq.h - msg_producer.h - msg_queue.h - msg_passing.h - pmt.h - pmt_pool.h - pmt_sugar.h - realtime.h - sys_pri.h - thread_body_wrapper.h - thread_group.h - thread.h -DESTINATION ${GR_INCLUDE_DIR}/gruel COMPONENT "gruel_devel") diff --git a/gruel/src/include/gruel/api.h b/gruel/src/include/gruel/api.h deleted file mode 100644 index 73a8a5719b..0000000000 --- a/gruel/src/include/gruel/api.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_GRUEL_API_H -#define INCLUDED_GRUEL_API_H - -#include <attributes.h> - -#ifdef gruel_EXPORTS -# define GRUEL_API __GR_ATTR_EXPORT -#else -# define GRUEL_API __GR_ATTR_IMPORT -#endif - -#endif /* INCLUDED_GRUEL_API_H */ diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt deleted file mode 100644 index fc51c8f927..0000000000 --- a/gruel/src/lib/CMakeLists.txt +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 2010-2011,2013 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Include subdirs rather to populate to the sources lists. -######################################################################## -include(GrMiscUtils) -include(CheckCXXSourceCompiles) - -GR_CHECK_HDR_N_DEF(signal.h HAVE_SIGNAL_H) -GR_CHECK_HDR_N_DEF(sched.h HAVE_SCHED_H) - -set(CMAKE_REQUIRED_LIBRARIES -lpthread) -CHECK_CXX_SOURCE_COMPILES(" - #include <signal.h> - int main(){pthread_sigmask(0, 0, 0); return 0;} - " HAVE_PTHREAD_SIGMASK -) -GR_ADD_COND_DEF(HAVE_PTHREAD_SIGMASK) - -set(CMAKE_REQUIRED_LIBRARIES -lpthread) -CHECK_CXX_SOURCE_COMPILES(" - #include <pthread.h> - int main(){ - pthread_t pthread; - pthread_setschedparam(pthread, 0, 0); - return 0; - } " HAVE_PTHREAD_SETSCHEDPARAM -) -GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM) - -CHECK_CXX_SOURCE_COMPILES(" - #include <sched.h> - int main(){ - pid_t pid; - sched_setscheduler(pid, 0, 0); - return 0; - } " HAVE_SCHED_SETSCHEDULER -) -GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER) - -######################################################################## -# Include subdirs rather to populate to the sources lists. -######################################################################## -GR_INCLUDE_SUBDIRECTORY(msg) - -######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${Boost_INCLUDE_DIRS} -) -link_directories(${Boost_LIBRARY_DIRS}) - -######################################################################## -# Setup library -######################################################################## -list(APPEND gruel_sources - realtime.cc - sys_pri.cc - thread.cc - thread_body_wrapper.cc - thread_group.cc -) - -#Add Windows DLL resource file if using MSVC -if(MSVC) - include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) - - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/gruel.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/gruel.rc - @ONLY) - - list(APPEND gruel_sources - ${CMAKE_CURRENT_BINARY_DIR}/gruel.rc - ) -endif(MSVC) - -list(APPEND gruel_libs ${Boost_LIBRARIES}) - -if(HAVE_PTHREAD_SETSCHEDPARAM) - list(APPEND gruel_libs pthread) -endif() - -add_library(gruel SHARED ${gruel_sources}) -target_link_libraries(gruel ${gruel_libs}) -GR_LIBRARY_FOO(gruel RUNTIME_COMPONENT "gruel_runtime" DEVEL_COMPONENT "gruel_devel") - -######################################################################## -# Setup tests -# Set the test environment so the build libs will be found under MSVC. -######################################################################## -if(ENABLE_TESTING) - -include_directories(${CPPUNIT_INCLUDE_DIRS}) -link_directories(${CPPUNIT_LIBRARY_DIRS}) - -include(GrTest) -set(GR_TEST_TARGET_DEPS gruel) -list(APPEND test_gruel_sources test_gruel.cc) -add_executable(test_gruel ${test_gruel_sources}) -target_link_libraries(test_gruel gruel ${CPPUNIT_LIBRARIES}) -GR_ADD_TEST(gruel-test test_gruel) - -endif(ENABLE_TESTING) diff --git a/gruel/src/lib/gruel.rc.in b/gruel/src/lib/gruel.rc.in deleted file mode 100644 index 906b7d61c2..0000000000 --- a/gruel/src/lib/gruel.rc.in +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2013 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <afxres.h> - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@ - PRODUCTVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@ - FILEFLAGSMASK 0x3fL -#ifndef NDEBUG - FILEFLAGS 0x0L -#else - FILEFLAGS 0x1L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_DRV_INSTALLABLE - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "gruel" - VALUE "FileVersion", "@VERSION@" - VALUE "InternalName", "gruel.dll" - VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" - VALUE "OriginalFilename", "gruel.dll" - VALUE "ProductName", "gruel" - VALUE "ProductVersion", "@VERSION@" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - END diff --git a/gruel/src/lib/test_gruel.cc b/gruel/src/lib/test_gruel.cc deleted file mode 100644 index f32e3f3417..0000000000 --- a/gruel/src/lib/test_gruel.cc +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009,2010,2011 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <cppunit/TextTestRunner.h> -#include <cppunit/XmlOutputter.h> - -#include <stdlib.h> -#include <sys/stat.h> - -#include "pmt/qa_pmt.h" - -#include <boost/filesystem/operations.hpp> -#include <boost/filesystem/path.hpp> -namespace fs = boost::filesystem; - -int -main(int argc, char **argv) -{ - fs::path path = fs::current_path() / ".unittests"; - if (!fs::is_directory(path)) fs::create_directory(path); - path = path / "gruel.xml"; - - CppUnit::TextTestRunner runner; - std::ofstream xmlfile(path.string().c_str()); - CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - - runner.addTest(qa_pmt::suite ()); - runner.setOutputter(xmlout); - - bool was_successful = runner.run("", false); - - return was_successful ? 0 : 1; -} diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt deleted file mode 100644 index ad0139b538..0000000000 --- a/gruel/src/swig/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2011-2012 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Setup swig generation -######################################################################## -include(GrPython) -include(GrSwig) - -set(GR_SWIG_TARGET_DEPS pmt_generated) -set(GR_SWIG_INCLUDE_DIRS - ${CMAKE_CURRENT_BINARY_DIR} - ${GRUEL_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) -set(GR_SWIG_LIBRARIES gruel) - -set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gruel ${CMAKE_CURRENT_BINARY_DIR}/../include/gruel) - -GR_SWIG_MAKE(pmt_swig pmt_swig.i) - -GR_SWIG_INSTALL( - TARGETS pmt_swig - DESTINATION ${GR_PYTHON_DIR}/pmt - COMPONENT "gruel_python" -) - -install( - FILES gr_intrusive_ptr.i pmt_swig.i gruel_common.i - ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/gruel/swig - COMPONENT "gruel_swig" -) - -add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME}) diff --git a/gruel/src/swig/__init__.py b/gruel/src/swig/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/gruel/src/swig/__init__.py +++ /dev/null |