build: removed last references to GRUEL.

Also update qa_runtime to pull in qa_pmt tests.
author: Tom Rondeau <trondeau@vt.edu> 2013-04-01 13:41:04 -0400
committer: Johnathan Corgan <johnathan@corganlabs.com> 2013-04-01 16:25:12 -0700
commit: 9e2eef3cfc7ead637e578eed73e8f33f24d3ed8a (patch)
tree: 69563d65ba2bb380939f15f71891e3dfdfc2f0a3 /gruel
parent: 5672d2a4082a40a12f96362d59b16b47b9d3ce09 (diff)
10 files changed, 0 insertions, 499 deletions
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
author	Tom Rondeau <trondeau@vt.edu>	2013-04-01 13:41:04 -0400
committer	Johnathan Corgan <johnathan@corganlabs.com>	2013-04-01 16:25:12 -0700
commit	9e2eef3cfc7ead637e578eed73e8f33f24d3ed8a (patch)
tree	69563d65ba2bb380939f15f71891e3dfdfc2f0a3 /gruel
parent	5672d2a4082a40a12f96362d59b16b47b9d3ce09 (diff)