[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint' |
|
Date: |
Fri, 8 Aug 2014 21:25:06 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 4ac28002fbea740f78c2339446cca2d1f118628f
Merge: 41d0844 3d5df0d
Author: Tom Rondeau <address@hidden>
Date: Fri Aug 8 16:44:15 2014 -0400
Merge branch 'maint'
Conflicts:
gnuradio-runtime/CMakeLists.txt
gnuradio-runtime/lib/controlport/CMakeLists.txt
cmake/Modules/FindICE-3.5.cmake | 127 ---
cmake/Modules/FindICE.cmake | 127 ---
docs/doxygen/other/ctrlport.dox | 332 +-------
docs/doxygen/other/perf_counters.dox | 10 -
gnuradio-runtime/CMakeLists.txt | 24 -
gnuradio-runtime/ctrlport.conf.example | 30 -
gnuradio-runtime/ctrlport.conf.in | 6 -
gnuradio-runtime/gnuradio-runtime.conf.in | 3 +-
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 6 -
.../include/gnuradio/IcePy_Communicator.h | 35 -
.../include/gnuradio/ice_application_base.h | 231 ------
.../include/gnuradio/ice_server_template.h | 97 ---
.../include/gnuradio/pycallback_object.h | 15 -
.../include/gnuradio/rpcpmtconverters_ice.h | 35 -
.../include/gnuradio/rpcserver_booter_ice.h | 49 --
gnuradio-runtime/include/gnuradio/rpcserver_ice.h | 228 ------
.../include/gnuradio/rpcserver_selector.h | 4 +-
gnuradio-runtime/lib/controlport/CMakeLists.txt | 26 +-
gnuradio-runtime/lib/controlport/ICE_LICENSE | 54 --
gnuradio-runtime/lib/controlport/frontend.ice | 151 ----
gnuradio-runtime/lib/controlport/gnuradio.ice | 105 ---
.../lib/controlport/ice_application_base.cc | 43 --
.../lib/controlport/rpcpmtconverters_ice.cc | 151 ----
.../lib/controlport/rpcserver_booter_ice.cc | 54 --
gnuradio-runtime/lib/controlport/rpcserver_ice.cc | 192 -----
.../lib/controlport/rpcserver_selector.cc | 3 +-
.../python/gnuradio/ctrlport/CMakeLists.txt | 66 --
.../python/gnuradio/ctrlport/IceRadioClient.py | 104 ---
.../python/gnuradio/ctrlport/__init__.py | 2 -
.../python/gnuradio/ctrlport/gr-ctrlport-curses | 268 -------
.../python/gnuradio/ctrlport/gr-ctrlport-monitor | 752 ------------------
.../python/gnuradio/ctrlport/gr-perf-monitor | 591 --------------
.../python/gnuradio/ctrlport/gr-perf-monitorx | 849 ---------------------
gnuradio-runtime/swig/CMakeLists.txt | 2 -
gr-analog/lib/CMakeLists.txt | 1 -
gr-analog/swig/CMakeLists.txt | 1 -
gr-atsc/swig/CMakeLists.txt | 1 -
gr-audio/lib/CMakeLists.txt | 1 -
gr-audio/swig/CMakeLists.txt | 2 -
gr-blocks/grc/CMakeLists.txt | 2 -
gr-blocks/grc/blocks_block_tree.xml | 2 -
gr-blocks/grc/blocks_ctrlport_performance.xml | 49 --
gr-blocks/grc/blocks_ctrlport_viewer.xml | 49 --
gr-blocks/lib/CMakeLists.txt | 1 -
gr-blocks/python/blocks/qa_cpp_py_binding.py | 172 -----
gr-blocks/python/blocks/qa_cpp_py_binding_set.py | 150 ----
gr-blocks/python/blocks/qa_ctrlport_probes.py | 187 +----
gr-blocks/swig/CMakeLists.txt | 1 -
gr-channels/lib/CMakeLists.txt | 1 -
gr-channels/swig/CMakeLists.txt | 1 -
gr-comedi/lib/CMakeLists.txt | 1 -
gr-comedi/swig/CMakeLists.txt | 1 -
gr-digital/lib/CMakeLists.txt | 1 -
gr-digital/swig/CMakeLists.txt | 1 -
gr-fcd/lib/CMakeLists.txt | 1 -
gr-fcd/swig/CMakeLists.txt | 1 -
gr-fec/lib/CMakeLists.txt | 1 -
gr-fec/swig/CMakeLists.txt | 1 -
gr-fft/lib/CMakeLists.txt | 1 -
gr-fft/swig/CMakeLists.txt | 1 -
gr-filter/lib/CMakeLists.txt | 1 -
gr-filter/swig/CMakeLists.txt | 1 -
gr-noaa/lib/CMakeLists.txt | 1 -
gr-noaa/swig/CMakeLists.txt | 1 -
gr-pager/lib/CMakeLists.txt | 1 -
gr-pager/swig/CMakeLists.txt | 1 -
gr-qtgui/lib/CMakeLists.txt | 1 -
gr-qtgui/swig/CMakeLists.txt | 1 -
gr-trellis/lib/CMakeLists.txt | 1 -
gr-trellis/swig/CMakeLists.txt | 1 -
gr-uhd/lib/CMakeLists.txt | 1 -
gr-uhd/swig/CMakeLists.txt | 1 -
gr-video-sdl/lib/CMakeLists.txt | 1 -
gr-video-sdl/swig/CMakeLists.txt | 1 -
gr-vocoder/lib/CMakeLists.txt | 1 -
gr-vocoder/swig/CMakeLists.txt | 1 -
gr-wavelet/lib/CMakeLists.txt | 1 -
gr-wavelet/swig/CMakeLists.txt | 1 -
gr-wxgui/lib/CMakeLists.txt | 1 -
gr-wxgui/swig/CMakeLists.txt | 1 -
gr-zeromq/lib/CMakeLists.txt | 1 -
gr-zeromq/swig/CMakeLists.txt | 1 -
82 files changed, 16 insertions(+), 5409 deletions(-)
diff --cc gnuradio-runtime/lib/controlport/CMakeLists.txt
index e0d319b,c41d87b..262c5ad
--- a/gnuradio-runtime/lib/controlport/CMakeLists.txt
+++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt
@@@ -22,25 -22,10 +22,10 @@@ if(ENABLE_GR_CTRLPORT
# Add definition so we can compile in ControlPort to the blocks.
ADD_DEFINITIONS(-DGR_CTRLPORT)
- ########################################################################
- # Run ICE To compile Slice files
- ########################################################################
- EXECUTE_PROCESS(
- COMMAND "${ICE_SLICE2CPP}" "-I${CMAKE_CURRENT_SOURCE_DIR}"
- "--output-dir=${CMAKE_CURRENT_BINARY_DIR}/"
- "${CMAKE_CURRENT_SOURCE_DIR}/gnuradio.ice"
- )
-
-list(APPEND gnuradio_runtime_sources
+list(APPEND gnuradio_ctrlport_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/ice_application_base.cc
${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/rpcpmtconverters_ice.cc
${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_aggregator.cc
${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_aggregator.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_ice.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_ice.cc
${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
)