[Commit-gnuradio] [gnuradio] branch next updated (fecc85c -> 4e7a996)

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a change to branch next
in repository gnuradio.

      from  fecc85c   Merge branch 'master' into next
      adds  3d5df0d   controlport: removing use of ice for a controlport rpc.
      adds  4ac2800   Merge branch 'maint'
      adds  2e691d8   cmake: follow-up to previous merge
       new  4e7a996   Merge branch 'master' into next

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cmake/Modules/FindICE-3.5.cmake                    | 127 ---
 cmake/Modules/FindICE.cmake                        | 127 ---
 docs/doxygen/other/build_guide.dox                 |   1 -
 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/CMakeLists.txt                |   1 -
 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                       |   2 -
 gr-analog/swig/CMakeLists.txt                      |   1 -
 gr-atsc/lib/CMakeLists.txt                         |   1 -
 gr-atsc/swig/CMakeLists.txt                        |   1 -
 gr-audio/lib/CMakeLists.txt                        |   2 -
 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                       |   2 -
 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                     |   2 -
 gr-channels/swig/CMakeLists.txt                    |   1 -
 gr-comedi/lib/CMakeLists.txt                       |   2 -
 gr-comedi/swig/CMakeLists.txt                      |   1 -
 gr-digital/lib/CMakeLists.txt                      |   2 -
 gr-digital/swig/CMakeLists.txt                     |   1 -
 gr-dtv/lib/CMakeLists.txt                          |   1 -
 gr-dtv/swig/CMakeLists.txt                         |   1 -
 gr-fcd/lib/CMakeLists.txt                          |   1 -
 gr-fcd/swig/CMakeLists.txt                         |   1 -
 gr-fec/lib/CMakeLists.txt                          |   2 -
 gr-fec/swig/CMakeLists.txt                         |   1 -
 gr-fft/lib/CMakeLists.txt                          |   2 -
 gr-fft/swig/CMakeLists.txt                         |   1 -
 gr-filter/lib/CMakeLists.txt                       |   2 -
 gr-filter/swig/CMakeLists.txt                      |   1 -
 gr-noaa/lib/CMakeLists.txt                         |   2 -
 gr-noaa/swig/CMakeLists.txt                        |   1 -
 gr-pager/lib/CMakeLists.txt                        |   2 -
 gr-pager/swig/CMakeLists.txt                       |   1 -
 gr-qtgui/lib/CMakeLists.txt                        |   2 -
 gr-qtgui/swig/CMakeLists.txt                       |   1 -
 gr-trellis/lib/CMakeLists.txt                      |   2 -
 gr-trellis/swig/CMakeLists.txt                     |   1 -
 gr-uhd/lib/CMakeLists.txt                          |   1 -
 gr-uhd/swig/CMakeLists.txt                         |   1 -
 gr-video-sdl/lib/CMakeLists.txt                    |   2 -
 gr-video-sdl/swig/CMakeLists.txt                   |   1 -
 gr-vocoder/lib/CMakeLists.txt                      |   2 -
 gr-vocoder/swig/CMakeLists.txt                     |   1 -
 gr-wavelet/lib/CMakeLists.txt                      |   2 -
 gr-wavelet/swig/CMakeLists.txt                     |   1 -
 gr-wxgui/lib/CMakeLists.txt                        |   2 -
 gr-wxgui/swig/CMakeLists.txt                       |   1 -
 gr-zeromq/lib/CMakeLists.txt                       |   2 -
 gr-zeromq/swig/CMakeLists.txt                      |   1 -
 87 files changed, 16 insertions(+), 5432 deletions(-)
 delete mode 100644 cmake/Modules/FindICE-3.5.cmake
 delete mode 100644 cmake/Modules/FindICE.cmake
 delete mode 100644 gnuradio-runtime/ctrlport.conf.example
 delete mode 100644 gnuradio-runtime/ctrlport.conf.in
 delete mode 100644 gnuradio-runtime/include/gnuradio/IcePy_Communicator.h
 delete mode 100644 gnuradio-runtime/include/gnuradio/ice_application_base.h
 delete mode 100644 gnuradio-runtime/include/gnuradio/ice_server_template.h
 delete mode 100644 gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
 delete mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
 delete mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_ice.h
 delete mode 100644 gnuradio-runtime/lib/controlport/ICE_LICENSE
 delete mode 100644 gnuradio-runtime/lib/controlport/frontend.ice
 delete mode 100644 gnuradio-runtime/lib/controlport/gnuradio.ice
 delete mode 100644 gnuradio-runtime/lib/controlport/ice_application_base.cc
 delete mode 100644 gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
 delete mode 100644 gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
 delete mode 100644 gnuradio-runtime/lib/controlport/rpcserver_ice.cc
 delete mode 100644 gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
 delete mode 100755 gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
 delete mode 100755 
gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
 delete mode 100755 gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
 delete mode 100755 gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 delete mode 100644 gr-blocks/grc/blocks_ctrlport_performance.xml
 delete mode 100644 gr-blocks/grc/blocks_ctrlport_viewer.xml
 delete mode 100755 gr-blocks/python/blocks/qa_cpp_py_binding.py
 delete mode 100755 gr-blocks/python/blocks/qa_cpp_py_binding_set.py