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

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

From:	git
Subject:	[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
Date:	Fri, 28 Oct 2016 18:55:48 +0000 (UTC)
This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit ca8fdc31088c260316499c1c27a7ba5a6f3f87f2
Merge: 8d5e4f6 3fc5507
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 28 11:47:51 2016 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/swig/CMakeLists.txt
        gr-digital/swig/digital_swig.i
        gr-trellis/swig/CMakeLists.txt

 cmake/Modules/GrPlatform.cmake                     |   8 +
 gnuradio-runtime/lib/pmt/pmt.cc                    |  12 +-
 .../python/gnuradio/ctrlport/gr-perf-monitorx      |   2 +-
 gr-digital/swig/CMakeLists.txt                     |  83 +++---
 gr-digital/swig/digital_swig.i                     | 287 ---------------------
 gr-digital/swig/digital_swig.py.in                 |  24 ++
 gr-digital/swig/digital_swig0.i                    | 139 ++++++++++
 gr-digital/swig/digital_swig1.i                    | 120 +++++++++
 gr-digital/swig/digital_swig2.i                    | 112 ++++++++
 gr-trellis/swig/CMakeLists.txt                     |  63 +++--
 gr-trellis/swig/trellis_swig.py.in                 |  23 ++
 gr-trellis/swig/trellis_swig0.i                    | 117 +++++++++
 .../swig/{trellis_swig.i => trellis_swig1.i}       |  83 +-----
 .../gr-newmod/cmake/Modules/GrPlatform.cmake       |   8 +
 14 files changed, 664 insertions(+), 417 deletions(-)

diff --cc gr-digital/swig/CMakeLists.txt
index 0f1138f,fb13d3e..658ac46
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@@ -38,31 -38,58 +38,56 @@@ if(ENABLE_GR_CTRLPORT
    list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT")
  endif(ENABLE_GR_CTRLPORT)
  
- # Setup swig docs to depend on includes and pull in from build directory
- set(GR_SWIG_TARGET_DEPS digital_generated_includes)
- set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
- set(GR_SWIG_DOC_DIRS
+ configure_file(
+   ${CMAKE_CURRENT_SOURCE_DIR}/digital_swig.py.in
+   ${CMAKE_CURRENT_BINARY_DIR}/digital_swig.py
+ @ONLY)
+ 
+ # We split up the swig files into multiple sections to minimize the
+ # memory overhead. If a .i file grows too large, create a new file
+ # named 'digital_swigN.i' and add it to this list.
+ #
+ # Also add the line "from swig_blocksN import *" line to
+ # digital_swig.py.in.
+ set(GR_SWIG_BLOCK_IFILES
+   digital_swig0
+   digital_swig1
+   digital_swig2
+ )
+ 
+ foreach(swigfile ${GR_SWIG_BLOCK_IFILES})
+   set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
+   set(GR_SWIG_DOC_DIRS
      ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/digital
      ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/digital
- )
- set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
+   )
+   set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
+   set(GR_SWIG_TARGET_DEPS digital_generated_includes)
+   set(GR_SWIG_LIBRARIES gnuradio-digital
+     gnuradio-filter gnuradio-analog gnuradio-blocks)
+   GR_SWIG_MAKE(${swigfile} ${swigfile}.i)
  
- set(GR_SWIG_LIBRARIES gnuradio-digital
-   gnuradio-filter gnuradio-analog gnuradio-blocks)
+   GR_SWIG_INSTALL(
+     TARGETS ${swigfile}
+     DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
 -    COMPONENT "digital_python")
++  )
  
- GR_SWIG_MAKE(digital_swig digital_swig.i)
+   list(APPEND SWIGFILES ${swigfile}.i)
+   list(APPEND SWIGDOCFILES ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
+ endforeach(swigfile)
  
- GR_SWIG_INSTALL(
-     TARGETS digital_swig
-     DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
+ install(
+   FILES
+   ${SWIGFILES}
+   constellation.i
+   ofdm_equalizer.i
+   packet_header.i
+   ${SWIGDOCFILES}
+   DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
 -  COMPONENT "digital_swig"
  )
  
- install(
-     FILES
-     digital_swig.i
-     constellation.i
-     ofdm_equalizer.i
-     packet_header.i
-     ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i
-     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+ # Install the Python file that pulls in the swig built files.
+ GR_PYTHON_INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/digital_swig.py
+   DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
 -  COMPONENT "digital_python"
  )
diff --cc gr-digital/swig/digital_swig0.i
index 0000000,753d026..2ca617e
mode 000000,100644..100644
--- a/gr-digital/swig/digital_swig0.i
+++ b/gr-digital/swig/digital_swig0.i
@@@ -1,0 -1,142 +1,139 @@@
+ /*
+  * Copyright 2011-2016 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.
+  */
+ 
+ #define DIGITAL_API
+ #define ANALOG_API
+ #define BLOCKS_API
+ 
+ %include "gnuradio.i"
+ %include "stdint.i"
+ 
+ //load generated python docstrings
+ %include "digital_swig0_doc.i"
+ 
+ %include "gnuradio/analog/cpm.h"
+ 
+ %{
+ #include <gnuradio/blocks/control_loop.h>
+ %}
+ %include <gnuradio/blocks/control_loop.h>
+ 
+ %{
+ #include "gnuradio/digital/binary_slicer_fb.h"
+ #include "gnuradio/digital/cma_equalizer_cc.h"
+ #include "gnuradio/digital/constellation.h"
+ #include "gnuradio/digital/constellation_decoder_cb.h"
+ #include "gnuradio/digital/constellation_receiver_cb.h"
+ #include "gnuradio/digital/constellation_soft_decoder_cf.h"
+ #include "gnuradio/digital/corr_est_cc.h"
+ #include "gnuradio/digital/correlate_access_code_bb.h"
+ #include "gnuradio/digital/correlate_access_code_tag_bb.h"
+ #include "gnuradio/digital/correlate_access_code_bb_ts.h"
+ #include "gnuradio/digital/correlate_access_code_ff_ts.h"
 -#include "gnuradio/digital/correlate_and_sync_cc.h"
+ #include "gnuradio/digital/costas_loop_cc.h"
+ #include "gnuradio/digital/cpmmod_bc.h"
+ #include "gnuradio/digital/crc32.h"
+ #include "gnuradio/digital/crc32_bb.h"
+ #include "gnuradio/digital/crc32_async_bb.h"
+ #include "gnuradio/digital/descrambler_bb.h"
+ #include "gnuradio/digital/lms_dd_equalizer_cc.h"
+ #include "gnuradio/digital/ofdm_carrier_allocator_cvc.h"
+ #include "gnuradio/digital/ofdm_chanest_vcvc.h"
+ #include "gnuradio/digital/ofdm_cyclic_prefixer.h"
+ #include "gnuradio/digital/ofdm_equalizer_base.h"
+ #include "gnuradio/digital/ofdm_equalizer_simpledfe.h"
+ #include "gnuradio/digital/ofdm_equalizer_static.h"
+ #include "gnuradio/digital/ofdm_frame_acquisition.h"
+ #include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h"
+ #include "gnuradio/digital/ofdm_frame_sink.h"
+ #include "gnuradio/digital/ofdm_insert_preamble.h"
+ #include "gnuradio/digital/ofdm_mapper_bcv.h"
+ #include "gnuradio/digital/ofdm_sampler.h"
+ #include "gnuradio/digital/ofdm_serializer_vcc.h"
+ #include "gnuradio/digital/ofdm_sync_sc_cfb.h"
+ %}
+ 
+ %include "gnuradio/digital/binary_slicer_fb.h"
+ %include "gnuradio/digital/cma_equalizer_cc.h"
+ %include "gnuradio/digital/constellation.h"
+ %include "gnuradio/digital/constellation_decoder_cb.h"
+ %include "gnuradio/digital/constellation_receiver_cb.h"
+ %include "gnuradio/digital/constellation_soft_decoder_cf.h"
+ %include "gnuradio/digital/corr_est_cc.h"
+ %include "gnuradio/digital/correlate_access_code_bb.h"
+ %include "gnuradio/digital/correlate_access_code_tag_bb.h"
+ %include "gnuradio/digital/correlate_access_code_bb_ts.h"
+ %include "gnuradio/digital/correlate_access_code_ff_ts.h"
 -%include "gnuradio/digital/correlate_and_sync_cc.h"
+ %include "gnuradio/digital/costas_loop_cc.h"
+ %include "gnuradio/digital/cpmmod_bc.h"
+ %include "gnuradio/digital/crc32.h"
+ %include "gnuradio/digital/crc32_bb.h"
+ %include "gnuradio/digital/crc32_async_bb.h"
+ %include "gnuradio/digital/descrambler_bb.h"
+ %include "gnuradio/digital/lms_dd_equalizer_cc.h"
+ %include "gnuradio/digital/ofdm_carrier_allocator_cvc.h"
+ %include "gnuradio/digital/ofdm_chanest_vcvc.h"
+ %include "gnuradio/digital/ofdm_cyclic_prefixer.h"
+ %include "gnuradio/digital/ofdm_equalizer_base.h"
+ %include "gnuradio/digital/ofdm_equalizer_simpledfe.h"
+ %include "gnuradio/digital/ofdm_equalizer_static.h"
+ %include "gnuradio/digital/ofdm_frame_acquisition.h"
+ %include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h"
+ %include "gnuradio/digital/ofdm_frame_sink.h"
+ %include "gnuradio/digital/ofdm_insert_preamble.h"
+ %include "gnuradio/digital/ofdm_mapper_bcv.h"
+ %include "gnuradio/digital/ofdm_sampler.h"
+ %include "gnuradio/digital/ofdm_serializer_vcc.h"
+ %include "gnuradio/digital/ofdm_sync_sc_cfb.h"
+ 
+ GR_SWIG_BLOCK_MAGIC2(digital, binary_slicer_fb);
+ GR_SWIG_BLOCK_MAGIC2(digital, cma_equalizer_cc);
+ GR_SWIG_BLOCK_MAGIC2(digital, constellation_decoder_cb);
+ GR_SWIG_BLOCK_MAGIC2(digital, constellation_receiver_cb);
+ GR_SWIG_BLOCK_MAGIC2(digital, constellation_soft_decoder_cf);
+ GR_SWIG_BLOCK_MAGIC2(digital, corr_est_cc);
+ GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_tag_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_bb_ts);
+ GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_ff_ts);
 -GR_SWIG_BLOCK_MAGIC2(digital, correlate_and_sync_cc);
+ GR_SWIG_BLOCK_MAGIC2(digital, costas_loop_cc);
+ GR_SWIG_BLOCK_MAGIC2(digital, crc32_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, crc32_async_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, cpmmod_bc);
+ GR_SWIG_BLOCK_MAGIC2(digital, descrambler_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, lms_dd_equalizer_cc);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_carrier_allocator_cvc);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_chanest_vcvc);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_cyclic_prefixer);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_acquisition);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_equalizer_vcvc);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_sink);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_insert_preamble);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_mapper_bcv);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sampler);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_serializer_vcc);
+ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sync_sc_cfb);
+ 
+ GR_SWIG_BLOCK_MAGIC_FACTORY(digital, cpmmod_bc, gmskmod_bc);
+ 
+ // Properly package up non-block objects
+ %include "constellation.i"
+ %include "ofdm_equalizer.i"
diff --cc gr-trellis/swig/CMakeLists.txt
index e1ee66c,a493c67..14012ab
--- a/gr-trellis/swig/CMakeLists.txt
+++ b/gr-trellis/swig/CMakeLists.txt
@@@ -36,25 -36,53 +36,52 @@@ if(ENABLE_GR_CTRLPORT
    list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT")
  endif(ENABLE_GR_CTRLPORT)
  
- # Setup swig docs to depend on includes and pull in from build directory
- set(GR_SWIG_TARGET_DEPS trellis_generated_includes)
- set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i)
- set(GR_SWIG_DOC_DIRS
-     ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/trellis
-     ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/trellis
+ configure_file(
+   ${CMAKE_CURRENT_SOURCE_DIR}/trellis_swig.py.in
+   ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig.py
+ @ONLY)
+ 
+ # We split up the swig files into multiple sections to minimize the
+ # memory overhead. If a .i file grows too large, create a new file
+ # named 'trellis_swigN.i' and add it to this list.
+ #
+ # Also add the line "from swig_trellisN import *" line to
+ # trellis_swig.py.in.
+ set(GR_SWIG_TRELLIS_IFILES
+   trellis_swig0
+   trellis_swig1
  )
- set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
  
- GR_SWIG_MAKE(trellis_swig trellis_swig.i)
+ foreach(swigfile ${GR_SWIG_TRELLIS_IFILES})
+   set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
+   set(GR_SWIG_DOC_DIRS
+     ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/trellis
+     ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/trellis
+   )
+   set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
+   set(GR_SWIG_TARGET_DEPS trellis_generated_includes)
+   set(GR_SWIG_LIBRARIES gnuradio-trellis gnuradio-digital)
+   GR_SWIG_MAKE(${swigfile} ${swigfile}.i)
  
- GR_SWIG_INSTALL(
-     TARGETS trellis_swig
+   GR_SWIG_INSTALL(
+     TARGETS ${swigfile}
      DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis
- )
 -    COMPONENT "trellis_python")
++  )
+ 
+   list(APPEND SWIGFILES ${swigfile}.i)
+   list(APPEND SWIGDOCFILES ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
+ endforeach(swigfile)
  
  install(
      FILES
-     trellis_swig.i
-     ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
+     ${SWIGFILES}
+     ${SWIGDOCFILES}
      DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
 -    COMPONENT "trellis_swig"
  )
+ 
+ # Install the Python file that pulls in the swig built files.
+ GR_PYTHON_INSTALL(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig.py
+     DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis
+     COMPONENT "trellis_python"
+ )
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] [gnuradio] branch next updated (8d5e4f6 -> ca8fdc3), git, 2016/10/28
- [Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next, git <=
Prev by Date: [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'michaelld/split_digital_swig'
Next by Date: [Commit-gnuradio] [gnuradio] 03/05: Sync modtool GrPlatform.cmake with main GNURadio version.
Previous by thread: [Commit-gnuradio] [gnuradio] branch next updated (8d5e4f6 -> ca8fdc3)
Index(es):
- Date
- Thread