[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 41e3327bbe3418ff8e3c880710e3bc033572edb6
Merge: 2f816ba 745af6c
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 5 17:59:59 2017 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt

 gnuradio-runtime/lib/controlport/CMakeLists.txt    | 28 +++----
 .../python/gnuradio/ctrlport/CMakeLists.txt        | 24 +++---
 gr-blocks/swig/CMakeLists.txt                      |  5 ++
 gr-blocks/swig/blocks_swig.py.in                   |  5 ++
 gr-blocks/swig/blocks_swig0.i                      |  1 +
 gr-blocks/swig/blocks_swig1.i                      | 46 +----------
 gr-blocks/swig/blocks_swig10.i                     | 90 +++++++++++++++++++++
 gr-blocks/swig/blocks_swig2.i                      | 75 -----------------
 gr-blocks/swig/blocks_swig3.i                      | 81 -------------------
 gr-blocks/swig/blocks_swig4.i                      | 36 ---------
 gr-blocks/swig/blocks_swig5.i                      | 72 +----------------
 gr-blocks/swig/{blocks_swig5.i => blocks_swig6.i}  | 61 +-------------
 gr-blocks/swig/{blocks_swig1.i => blocks_swig7.i}  | 83 +++++--------------
 gr-blocks/swig/blocks_swig8.i                      | 93 ++++++++++++++++++++++
 gr-blocks/swig/blocks_swig9.i                      | 93 ++++++++++++++++++++++
 gr-uhd/apps/uhd_app.py                             | 73 ++++++++---------
 16 files changed, 373 insertions(+), 493 deletions(-)

diff --cc gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index ecf2417,be95946..d806a5d
--- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@@ -47,28 -50,33 +47,32 @@@ GR_PYTHON_INSTALL
  
  if(THRIFT_FOUND)
  
- EXECUTE_PROCESS(
-    COMMAND ${THRIFT_BIN} --gen py -out ${CMAKE_CURRENT_BINARY_DIR}/ 
${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
-    OUTPUT_VARIABLE THRIFT_PY_OUTPUT
-    ERROR_VARIABLE THRIFT_PY_ERROR
-    )
 -  list(APPEND thrift_targets
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/__init__.py
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/constants.py
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ControlPort.py
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ControlPort-remote
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/StreamReceiver.py
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/StreamReceiver-remote
 -    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ttypes.py
 -    )
+   add_custom_command(
+     DEPENDS 
${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
+     OUTPUT ${thrift_targets}
+     COMMAND ${THRIFT_BIN} --gen py -out ${CMAKE_CURRENT_BINARY_DIR}/ 
${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
 -    )
++  )
  
- GR_PYTHON_INSTALL(
+   GR_PYTHON_INSTALL(
      FILES
      ${CMAKE_CURRENT_SOURCE_DIR}/RPCConnectionThrift.py
      DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/
- )
 -    COMPONENT "runtime_python"
 -    )
++  )
 +
- GR_PYTHON_INSTALL(
-     FILES
++  list(APPEND thrift_targets
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/__init__.py
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/constants.py
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ControlPort.py
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ControlPort-remote
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/StreamReceiver.py
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/StreamReceiver-remote
 +    ${CMAKE_CURRENT_BINARY_DIR}/GNURadio/ttypes.py
++  )
+ 
+   GR_PYTHON_INSTALL(
+     FILES
+     ${thrift_targets}
      DESTINATION ${GR_PYTHON_DIR}/gnuradio/ctrlport/GNURadio
- )
 -    COMPONENT "runtime_python"
 -    )
++  )
  
  endif(THRIFT_FOUND)