diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-03 19:48:44 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-03 19:48:44 -0400 |
| commit | e6b8806be73f8da5a5cbfb690d01b47de03eab74 (patch) | |
| tree | e0addb08924d95957df994b722ed8aecba58f6cc | |
| parent | 0b4e1a2dae3ef3359e9a5b3f93bbd33c9a9ea95c (diff) | |
| parent | 807ef844b92b676c67c3133dd1530689d2b5e84d (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
39 files changed, 207 insertions, 118 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e2338e39e3..7b7b1e05be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,7 +303,7 @@ file(GLOB cmake_modules "cmake/Modules/*.cmake") install( FILES ${cmake_modules} DESTINATION ${GR_PKG_DATA_DIR}/cmake/Modules - COMPONENT "core_devel" + COMPONENT "runtime_devel" ) #finalize cpack after subdirs processed @@ -328,5 +328,5 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "core_devel" + COMPONENT "runtime_devel" ) diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt index e659ce94fc..abdc969690 100644 --- a/gnuradio-runtime/CMakeLists.txt +++ b/gnuradio-runtime/CMakeLists.txt @@ -100,28 +100,28 @@ CPACK_COMPONENT("runtime_runtime" GROUP "Runtime" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("runtime_devel" GROUP "Runtime" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("runtime_python" GROUP "Runtime" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;runtime_runtime" + DEPENDS "runtime_python;runtime_runtime" ) CPACK_COMPONENT("runtime_swig" GROUP "Runtime" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;runtime_python;runtime_devel" + DEPENDS "runtime_swig;runtime_python;runtime_devel" ) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime.conf.in @@ -132,14 +132,14 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf ctrlport.conf.example DESTINATION ${GR_PREFSDIR} - COMPONENT "core_runtime" + COMPONENT "runtime_runtime" ) if(ENABLE_GR_LOG AND HAVE_LOG4CPP) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf DESTINATION ${GR_CONF_DIR}/gnuradio - COMPONENT "core_runtime" + COMPONENT "runtime_runtime" ) endif(ENABLE_GR_LOG AND HAVE_LOG4CPP) diff --git a/gnuradio-runtime/ConfigChecks.cmake b/gnuradio-runtime/ConfigChecks.cmake index e6c97bada4..46e15b5051 100644 --- a/gnuradio-runtime/ConfigChecks.cmake +++ b/gnuradio-runtime/ConfigChecks.cmake @@ -154,14 +154,6 @@ CHECK_CXX_SOURCE_COMPILES(" GR_ADD_COND_DEF(HAVE_CREATEFILEMAPPING) ######################################################################## -CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H) -IF(HAVE_WINDOWS_H) - ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK) - MESSAGE(STATUS "Adding windows libs to gnuradio core libs...") - LIST(APPEND gnuradio_core_libs WS2_32.lib WSock32.lib) -ENDIF(HAVE_WINDOWS_H) - -######################################################################## SET(CMAKE_REQUIRED_LIBRARIES -lrt) CHECK_CXX_SOURCE_COMPILES(" #include <sys/types.h> diff --git a/gnuradio-runtime/include/gr_logger.h b/gnuradio-runtime/include/gr_logger.h index 2c1ee8d8ad..0e82c5134e 100644 --- a/gnuradio-runtime/include/gr_logger.h +++ b/gnuradio-runtime/include/gr_logger.h @@ -43,6 +43,10 @@ #include <boost/thread.hpp> #include <boost/format.hpp> +#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +typedef int mode_t; +#endif + #ifdef ENABLE_GR_LOG // We have three configurations... first logging to stdout/stderr diff --git a/gnuradio-runtime/include/ice_application_base.h b/gnuradio-runtime/include/ice_application_base.h index f25c7272fc..64ec615e5c 100644 --- a/gnuradio-runtime/include/ice_application_base.h +++ b/gnuradio-runtime/include/ice_application_base.h @@ -23,6 +23,11 @@ #ifndef ICE_APPLICATION_BASE_H #define ICE_APPLICATION_BASE_H +#ifdef HAVE_WINDOWS_H +#include <winsock2.h> +#include <sys/time.h> +#endif + #include <gr_runtime_api.h> #include <gr_prefs.h> #include <Ice/Ice.h> @@ -38,7 +43,6 @@ namespace { static const unsigned int ICEAPPLICATION_ACTIVATION_TIMEOUT_MS(600); }; - class GR_RUNTIME_API ice_application_common : public Ice::Application { public: @@ -48,7 +52,8 @@ class GR_RUNTIME_API ice_application_common : public Ice::Application static int d_reacquire_attributes; protected: - static bool d_main_called, d_have_ice_config; + static bool d_main_called; + static bool d_have_ice_config; static std::string d_endpointStr; static boost::shared_ptr<boost::thread> d_thread; ice_application_common() {;} @@ -147,7 +152,11 @@ void ice_application_base<TserverBase, TserverClass>::kickoff() int iter = 0; while(!d_this->application_started()) { + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) + ::Sleep(timer_ts.tv_nsec / 1000000); + #else ::nanosleep(&timer_ts, &rem_ts); + #endif if(!d_this->application_started()) std::cout << "@"; if(iter++ > 100) { diff --git a/gnuradio-runtime/include/pmt/api.h b/gnuradio-runtime/include/pmt/api.h index 5dcc8a84a5..2deba0a2d7 100644 --- a/gnuradio-runtime/include/pmt/api.h +++ b/gnuradio-runtime/include/pmt/api.h @@ -24,7 +24,7 @@ #include <attributes.h> -#ifdef pmt_EXPORTS +#ifdef gnuradio_runtime_EXPORTS # define PMT_API __GR_ATTR_EXPORT #else # define PMT_API __GR_ATTR_IMPORT diff --git a/gnuradio-runtime/include/rpcmanager.h b/gnuradio-runtime/include/rpcmanager.h index 6e1e181c3c..6a385c8998 100644 --- a/gnuradio-runtime/include/rpcmanager.h +++ b/gnuradio-runtime/include/rpcmanager.h @@ -50,7 +50,9 @@ class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base }; private: - static bool make_aggregator, booter_registered, aggregator_registered; + static bool make_aggregator; + static bool booter_registered; + static bool aggregator_registered; static void rpcserver_booter_base_sptr_dest( rpcserver_booter_base* b) {;} static rpcserver_booter_base* boot; static std::auto_ptr<rpcserver_booter_aggregator> aggregator; diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 702aa11b13..bc83f5c10f 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -130,7 +130,7 @@ list(APPEND gnuradio_runtime_sources # PowerPC workaround for posix_memalign # Might not be needed, but we'll keep it for now. if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - list(APPEND gnuradio_core_sources + list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_SOURCE_DIR}/posix_memalign.cc ) endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") @@ -141,6 +141,14 @@ list(APPEND gnuradio_runtime_libs ${LOG4CPP_LIBRARIES} ) +#Add libraries for winsock2.h on Windows +CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H) +IF(HAVE_WINDOWS_H) + ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK -DWIN32_LEAN_AND_MEAN) + MESSAGE(STATUS "Adding windows libs to gnuradio runtime libs...") + LIST(APPEND gnuradio_runtime_libs WS2_32.lib WSock32.lib) +ENDIF(HAVE_WINDOWS_H) + #need to link with librt on ubuntu 11.10 for shm_* if(LINUX) list(APPEND gnuradio_runtime_libs rt) @@ -148,6 +156,8 @@ endif() if(ENABLE_GR_CTRLPORT) +include_directories(${ICE_INCLUDE_DIR}) + # Add definition so we can compile in ControlPort to the blocks. ADD_DEFINITIONS(-DGR_CTRLPORT) @@ -190,6 +200,23 @@ list(APPEND gnuradio_runtime_libs endif(ENABLE_GR_CTRLPORT) ######################################################################## +# Add DLL resource file when using MSVC +######################################################################## + +if(MSVC) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.rc + @ONLY) + + list(APPEND gnuradio_runtime_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.rc + ) +endif(MSVC) + +######################################################################## # Control availability of vmcircbuf methods. # For now, only allows disabling of shm methods, which cause uncatchable # segmentation faults on Cygwin with gcc 4.x (x <= 5) diff --git a/gnuradio-runtime/lib/gnuradio-runtime.rc.in b/gnuradio-runtime/lib/gnuradio-runtime.rc.in new file mode 100644 index 0000000000..361d6a92e7 --- /dev/null +++ b/gnuradio-runtime/lib/gnuradio-runtime.rc.in @@ -0,0 +1,55 @@ +/* -*- 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", "gnuradio-runtime" + VALUE "FileVersion", "@VERSION@" + VALUE "InternalName", "gnuradio-runtime.dll" + VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" + VALUE "OriginalFilename", "gnuradio-runtime.dll" + VALUE "ProductName", "gnuradio-runtime" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc index daafca20cd..7dc7b17ea0 100644 --- a/gnuradio-runtime/lib/test_runtime.cc +++ b/gnuradio-runtime/lib/test_runtime.cc @@ -35,7 +35,7 @@ int main (int argc, char **argv) { CppUnit::TextTestRunner runner; - std::ofstream xmlfile(get_unittest_path("gnuradio_core_runtime.xml").c_str()); + std::ofstream xmlfile(get_unittest_path("gnuradio_runtime_runtime.xml").c_str()); CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); runner.addTest(qa_runtime::suite()); diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt index 4a61c016c4..af563d3327 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt @@ -37,7 +37,7 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py ${CMAKE_CURRENT_SOURCE_DIR}/IceRadioClient.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/ - COMPONENT "core_python" + COMPONENT "runtime_python" ) # We don't want to install these in the root Python directory, but we @@ -48,35 +48,35 @@ GR_PYTHON_INSTALL( ${CMAKE_BINARY_DIR}/gnuradio-runtime/python/gnuradio_ice.py ${CMAKE_BINARY_DIR}/gnuradio-runtime/python/frontend_ice.py DESTINATION ${GR_PYTHON_DIR} - COMPONENT "core_python" + COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/__init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/GNURadio - COMPONENT "core_python" + COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/Booter/__init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/GNURadio/Booter - COMPONENT "core_python" + COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/Frontend/__init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/GNURadio/Frontend - COMPONENT "core_python" + COMPONENT "runtime_python" ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon.png DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport - COMPONENT "core_python" + COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( @@ -84,7 +84,7 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_SOURCE_DIR}/GrDataPlotter.py ${CMAKE_CURRENT_SOURCE_DIR}/monitor.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/ - COMPONENT "core_python" + COMPONENT "runtime_python" ) GR_PYTHON_INSTALL( @@ -94,5 +94,5 @@ GR_PYTHON_INSTALL( ${CMAKE_CURRENT_SOURCE_DIR}/gr-ctrlport-curses DESTINATION ${GR_RUNTIME_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt index c147981472..f0276a8d53 100644 --- a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt @@ -32,5 +32,5 @@ GR_PYTHON_INSTALL(FILES socket_stuff.py daemon.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index 24b202dce7..10a9976496 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -60,28 +60,28 @@ CPACK_COMPONENT("analog_runtime" GROUP "Analog" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("analog_devel" GROUP "Analog" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("analog_python" GROUP "Analog" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;analog_runtime" + DEPENDS "runtime_python;analog_runtime" ) CPACK_COMPONENT("analog_swig" GROUP "Analog" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;analog_python;analog_devel" + DEPENDS "runtime_swig;analog_python;analog_devel" ) ######################################################################## diff --git a/gr-analog/examples/tags/CMakeLists.txt b/gr-analog/examples/tags/CMakeLists.txt index b755027a03..ba95100665 100644 --- a/gr-analog/examples/tags/CMakeLists.txt +++ b/gr-analog/examples/tags/CMakeLists.txt @@ -22,5 +22,5 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS uhd_burst_detector.py DESTINATION ${GR_PKG_DATA_DIR}/examples/tags - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index a281cc8401..5e136cadae 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -56,21 +56,21 @@ CPACK_COMPONENT("atsc_runtime" GROUP "ATSC" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("atsc_devel" GROUP "ATSC" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("atsc_python" GROUP "ATSC" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;atsc_runtime" + DEPENDS "runtime_python;atsc_runtime" ) CPACK_COMPONENT("atsc_examples" @@ -84,7 +84,7 @@ CPACK_COMPONENT("atsc_swig" GROUP "ATSC" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;atsc_python;atsc_devel" + DEPENDS "runtime_swig;atsc_python;atsc_devel" ) ######################################################################## diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt index 9aa343b45e..6c3a816f7f 100644 --- a/gr-audio/CMakeLists.txt +++ b/gr-audio/CMakeLists.txt @@ -52,21 +52,21 @@ CPACK_COMPONENT("audio_runtime" GROUP "Audio" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("audio_devel" GROUP "Audio" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("audio_python" GROUP "Audio" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;audio_runtime" + DEPENDS "runtime_python;audio_runtime" ) CPACK_COMPONENT("audio_examples" @@ -80,7 +80,7 @@ CPACK_COMPONENT("audio_swig" GROUP "Audio" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;audio_python;audio_devel" + DEPENDS "runtime_swig;audio_python;audio_devel" ) ######################################################################## diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index c39337d0d5..10e779fc20 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -53,28 +53,28 @@ CPACK_COMPONENT("blocks_runtime" GROUP "Blocks" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("blocks_devel" GROUP "Blocks" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("blocks_python" GROUP "Blocks" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;blocks_runtime" + DEPENDS "runtime_python;blocks_runtime" ) CPACK_COMPONENT("blocks_swig" GROUP "Blocks" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;blocks_python;blocks_devel" + DEPENDS "runtime_swig;blocks_python;blocks_devel" ) ######################################################################## diff --git a/gr-blocks/examples/ctrlport/CMakeLists.txt b/gr-blocks/examples/ctrlport/CMakeLists.txt index 47ef4c225e..ffa0766c78 100644 --- a/gr-blocks/examples/ctrlport/CMakeLists.txt +++ b/gr-blocks/examples/ctrlport/CMakeLists.txt @@ -21,5 +21,5 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS DESTINATION ${GR_PKG_CTRLPORT_EXAMPLES_DIR} - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gr-blocks/examples/metadata/CMakeLists.txt b/gr-blocks/examples/metadata/CMakeLists.txt index 53a54b9d5a..8d7bbe79e0 100644 --- a/gr-blocks/examples/metadata/CMakeLists.txt +++ b/gr-blocks/examples/metadata/CMakeLists.txt @@ -26,5 +26,5 @@ install( file_metadata_vector_sink.grc file_metadata_vector_source.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/metadata - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gr-blocks/examples/msg_passing/CMakeLists.txt b/gr-blocks/examples/msg_passing/CMakeLists.txt index c4b207a1e4..9c24355f7f 100644 --- a/gr-blocks/examples/msg_passing/CMakeLists.txt +++ b/gr-blocks/examples/msg_passing/CMakeLists.txt @@ -23,5 +23,5 @@ install( FILES strobe.grc DESTINATION ${GR_PKG_DATA_DIR}/examples/msg_passing - COMPONENT "core_python" + COMPONENT "runtime_python" ) diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt index 225a297f25..f73f49565f 100644 --- a/gr-channels/CMakeLists.txt +++ b/gr-channels/CMakeLists.txt @@ -57,28 +57,28 @@ CPACK_COMPONENT("channels_runtime" GROUP "Channel Models" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("channels_devel" GROUP "Channel Models" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("channels_python" GROUP "Channel Models" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;channels_runtime" + DEPENDS "runtime_python;channels_runtime" ) CPACK_COMPONENT("channels_swig" GROUP "Channel Models" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;channels_python;channels_devel" + DEPENDS "runtime_swig;channels_python;channels_devel" ) ######################################################################## diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index ac6cd203b2..1cd89b8144 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -61,28 +61,28 @@ CPACK_COMPONENT("comedi_runtime" GROUP "Comedi" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("comedi_devel" GROUP "Comedi" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("comedi_python" GROUP "Comedi" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;comedi_runtime" + DEPENDS "runtime_python;comedi_runtime" ) CPACK_COMPONENT("comedi_swig" GROUP "Comedi" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;comedi_python;comedi_devel" + DEPENDS "runtime_swig;comedi_python;comedi_devel" ) ######################################################################## diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index 171ea635b8..7d5a7541d1 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -64,28 +64,28 @@ CPACK_COMPONENT("digital_runtime" GROUP "Digital" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("digital_devel" GROUP "Digital" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("digital_python" GROUP "Digital" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;digital_runtime" + DEPENDS "runtime_python;digital_runtime" ) CPACK_COMPONENT("digital_swig" GROUP "Digital" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;digital_python;digital_devel" + DEPENDS "runtime_swig;digital_python;digital_devel" ) ######################################################################## diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt index ede4425a4c..bd87f9cf13 100644 --- a/gr-fcd/CMakeLists.txt +++ b/gr-fcd/CMakeLists.txt @@ -69,21 +69,21 @@ CPACK_COMPONENT("fcd_runtime" GROUP "FCD" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime;audio_runtime" + DEPENDS "runtime_runtime;audio_runtime" ) CPACK_COMPONENT("fcd_devel" GROUP "FCD" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel;audio_devel" + DEPENDS "runtime_devel;audio_devel" ) CPACK_COMPONENT("fcd_python" GROUP "FCD" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;fcd_runtime" + DEPENDS "runtime_python;fcd_runtime" ) CPACK_COMPONENT("fcd_examples" @@ -97,7 +97,7 @@ CPACK_COMPONENT("fcd_swig" GROUP "FCD" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;fcd_python;fcd_devel" + DEPENDS "runtime_swig;fcd_python;fcd_devel" ) ######################################################################## diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index 171802610a..01806565a4 100644 --- a/gr-fec/CMakeLists.txt +++ b/gr-fec/CMakeLists.txt @@ -60,28 +60,28 @@ CPACK_COMPONENT("fec_runtime" GROUP "FEC" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("fec_devel" GROUP "FEC" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("fec_python" GROUP "FEC" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;fec_runtime" + DEPENDS "runtime_python;fec_runtime" ) CPACK_COMPONENT("fec_swig" GROUP "FEC" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;fec_python;fec_devel" + DEPENDS "runtime_swig;fec_python;fec_devel" ) ######################################################################## diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 37c0294cbf..e9732eb30b 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -57,28 +57,28 @@ CPACK_COMPONENT("fft_runtime" GROUP "FFT" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("fft_devel" GROUP "FFT" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("fft_python" GROUP "FFT" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;fft_runtime" + DEPENDS "runtime_python;fft_runtime" ) CPACK_COMPONENT("fft_swig" GROUP "FFT" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;fft_python;fft_devel" + DEPENDS "runtime_swig;fft_python;fft_devel" ) ######################################################################## diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt index 0aeb2bbbb6..05414f4967 100644 --- a/gr-filter/CMakeLists.txt +++ b/gr-filter/CMakeLists.txt @@ -64,28 +64,28 @@ CPACK_COMPONENT("filter_runtime" GROUP "Filter" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("filter_devel" GROUP "Filter" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("filter_python" GROUP "Filter" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;filter_runtime" + DEPENDS "runtime_python;filter_runtime" ) CPACK_COMPONENT("filter_swig" GROUP "Filter" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;filter_python;filter_devel" + DEPENDS "runtime_swig;filter_python;filter_devel" ) ######################################################################## diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index 5a73c57d8b..f13769f95c 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -58,28 +58,28 @@ CPACK_COMPONENT("noaa_runtime" GROUP "NOAA" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("noaa_devel" GROUP "NOAA" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("noaa_python" GROUP "NOAA" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;noaa_runtime" + DEPENDS "runtime_python;noaa_runtime" ) CPACK_COMPONENT("noaa_swig" GROUP "NOAA" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;noaa_python;noaa_devel" + DEPENDS "runtime_swig;noaa_python;noaa_devel" ) ######################################################################## diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt index a92886cf30..48c11d6840 100644 --- a/gr-pager/CMakeLists.txt +++ b/gr-pager/CMakeLists.txt @@ -64,28 +64,28 @@ CPACK_COMPONENT("pager_runtime" GROUP "Pager" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("pager_devel" GROUP "Pager" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("pager_python" GROUP "Pager" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;pager_runtime" + DEPENDS "runtime_python;pager_runtime" ) CPACK_COMPONENT("pager_swig" GROUP "Pager" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;pager_python;pager_devel" + DEPENDS "runtime_swig;pager_python;pager_devel" ) ######################################################################## diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 4457fbf6b9..ca3a809b5b 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -80,28 +80,28 @@ CPACK_COMPONENT("qtgui_runtime" GROUP "QtGUI" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("qtgui_devel" GROUP "QtGUI" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("qtgui_python" GROUP "QtGUI" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;qtgui_runtime" + DEPENDS "runtime_python;qtgui_runtime" ) CPACK_COMPONENT("qtgui_swig" GROUP "QtGUI" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;qtgui_python;qtgui_devel" + DEPENDS "runtime_swig;qtgui_python;qtgui_devel" ) ######################################################################## diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt index 05474dd8c5..688546416e 100644 --- a/gr-shd/CMakeLists.txt +++ b/gr-shd/CMakeLists.txt @@ -80,28 +80,28 @@ CPACK_COMPONENT("shd_runtime" GROUP "SHD" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("shd_devel" GROUP "SHD" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("shd_python" GROUP "SHD" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;shd_runtime" + DEPENDS "runtime_python;shd_runtime" ) CPACK_COMPONENT("shd_swig" GROUP "SHD" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;shd_python;shd_devel" + DEPENDS "runtime_swig;shd_python;shd_devel" ) ######################################################################## diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index 245f3f9c25..5646a6b579 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -66,21 +66,21 @@ CPACK_COMPONENT("trellis_runtime" GROUP "Trellis" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("trellis_devel" GROUP "Trellis" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("trellis_python" GROUP "Trellis" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;trellis_runtime" + DEPENDS "runtime_python;trellis_runtime" ) CPACK_COMPONENT("trellis_examples" @@ -94,7 +94,7 @@ CPACK_COMPONENT("trellis_swig" GROUP "Trellis" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;trellis_python;trellis_devel" + DEPENDS "runtime_swig;trellis_python;trellis_devel" ) ######################################################################## diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt index 30dcba141d..faec68859b 100644 --- a/gr-uhd/CMakeLists.txt +++ b/gr-uhd/CMakeLists.txt @@ -58,21 +58,21 @@ CPACK_COMPONENT("uhd_runtime" GROUP "UHD" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("uhd_devel" GROUP "UHD" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("uhd_python" GROUP "UHD" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;uhd_runtime" + DEPENDS "runtime_python;uhd_runtime" ) CPACK_COMPONENT("uhd_examples" @@ -86,7 +86,7 @@ CPACK_COMPONENT("uhd_swig" GROUP "UHD" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;uhd_python;uhd_devel" + DEPENDS "runtime_swig;uhd_python;uhd_devel" ) ######################################################################## diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt index 19981ab68b..decd973485 100644 --- a/gr-utils/CMakeLists.txt +++ b/gr-utils/CMakeLists.txt @@ -42,7 +42,7 @@ include(GrPackage) CPACK_COMPONENT("utils" DISPLAY_NAME "Utils" DESCRIPTION "Misc gnuradio python utilities" - DEPENDS "core_python" + DEPENDS "runtime_python" ) ######################################################################## diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt index 91005269bf..d0f230892c 100644 --- a/gr-video-sdl/CMakeLists.txt +++ b/gr-video-sdl/CMakeLists.txt @@ -54,28 +54,28 @@ CPACK_COMPONENT("video_sdl_runtime" GROUP "Video SDL" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("video_sdl_devel" GROUP "Video SDL" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("video_sdl_python" GROUP "Video SDL" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;video_sdl_runtime" + DEPENDS "runtime_python;video_sdl_runtime" ) CPACK_COMPONENT("video_sdl_swig" GROUP "Video SDL" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;video_sdl_python;video_sdl_devel" + DEPENDS "runtime_swig;video_sdl_python;video_sdl_devel" ) ######################################################################## diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 03f77376a9..47c64369a2 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -57,21 +57,21 @@ CPACK_COMPONENT("vocoder_runtime" GROUP "Vocoder" DISPLAY_NAME "Runtime" DESCRIPTION "Dynamic link libraries" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("vocoder_devel" GROUP "Vocoder" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("vocoder_python" GROUP "Vocoder" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime" - DEPENDS "core_python;vocoder_runtime" + DEPENDS "runtime_python;vocoder_runtime" ) CPACK_COMPONENT("vocoder_examples" @@ -85,7 +85,7 @@ CPACK_COMPONENT("vocoder_swig" GROUP "Vocoder" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;vocoder_python;vocoder_devel" + DEPENDS "runtime_swig;vocoder_python;vocoder_devel" ) ######################################################################## diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index 11a7eb2689..4c1e3afb38 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -57,28 +57,28 @@ CPACK_COMPONENT("wavelet_runtime" GROUP "WAVELET" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("wavelet_devel" GROUP "WAVELET" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("wavelet_python" GROUP "WAVELET" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;wavelet_runtime" + DEPENDS "runtime_python;wavelet_runtime" ) CPACK_COMPONENT("wavelet_swig" GROUP "WAVELET" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;wavelet_python;wavelet_devel" + DEPENDS "runtime_swig;wavelet_python;wavelet_devel" ) ######################################################################## diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index a265b688cf..5140db5658 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -65,7 +65,7 @@ include(GrPackage) CPACK_COMPONENT("wxgui" DISPLAY_NAME "WxGUI" DESCRIPTION "Wx GUI plotter widgets and grc wrappers" - DEPENDS "core_python" + DEPENDS "runtime_python" ) ######################################################################## diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index daf874b264..05c1293aa0 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -60,7 +60,7 @@ include(GrPackage) CPACK_COMPONENT("grc" DISPLAY_NAME "GNU Radio Companion" DESCRIPTION "Graphical flow graph designer" - DEPENDS "core_python" + DEPENDS "runtime_python" ) ######################################################################## |