[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/13: blocks: swig: increase split from 5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/13: blocks: swig: increase split from 5 to 10, to do a native build on low memory systems (e.g., RPi). Amazingly, the single new block added in b49f52f9 broke native build, so the prior split was fragile. This new spit leaves a significant margin for adding new blocks here and there without breaking native builds on low memory systems. |
|
Date: |
Mon, 6 Mar 2017 03:30:55 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit db503f27f9ed7dd286a7ba2d22f1be5887beae4f
Author: Michael Dickens <address@hidden>
Date: Mon Jan 30 10:16:59 2017 -0500
blocks: swig: increase split from 5 to 10, to do a native build on low
memory systems (e.g., RPi). Amazingly, the single new block added in b49f52f9
broke native build, so the prior split was fragile. This new spit leaves a
significant margin for adding new blocks here and there without breaking native
builds on low memory systems.
---
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 +++++++++++++++++++++++
13 files changed, 312 insertions(+), 429 deletions(-)
diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
index c128a9b..d64c347 100644
--- a/gr-blocks/swig/CMakeLists.txt
+++ b/gr-blocks/swig/CMakeLists.txt
@@ -52,6 +52,11 @@ set(GR_SWIG_BLOCK_IFILES
blocks_swig3
blocks_swig4
blocks_swig5
+ blocks_swig6
+ blocks_swig7
+ blocks_swig8
+ blocks_swig9
+ blocks_swig10
)
foreach(swigfile ${GR_SWIG_BLOCK_IFILES})
diff --git a/gr-blocks/swig/blocks_swig.py.in b/gr-blocks/swig/blocks_swig.py.in
index a0bd574..7682f17 100644
--- a/gr-blocks/swig/blocks_swig.py.in
+++ b/gr-blocks/swig/blocks_swig.py.in
@@ -25,3 +25,8 @@ from blocks_swig2 import *
from blocks_swig3 import *
from blocks_swig4 import *
from blocks_swig5 import *
+from blocks_swig6 import *
+from blocks_swig7 import *
+from blocks_swig8 import *
+from blocks_swig9 import *
+from blocks_swig10 import *
diff --git a/gr-blocks/swig/blocks_swig0.i b/gr-blocks/swig/blocks_swig0.i
index 37b8ef6..66e6ca1 100644
--- a/gr-blocks/swig/blocks_swig0.i
+++ b/gr-blocks/swig/blocks_swig0.i
@@ -24,6 +24,7 @@
%include "gnuradio.i"
+//load generated python docstrings
%include "blocks_swig0_doc.i"
%{
diff --git a/gr-blocks/swig/blocks_swig1.i b/gr-blocks/swig/blocks_swig1.i
index 24483fc..cbff920 100644
--- a/gr-blocks/swig/blocks_swig1.i
+++ b/gr-blocks/swig/blocks_swig1.i
@@ -24,24 +24,10 @@
%include "gnuradio.i"
+//load generated python docstrings
%include "blocks_swig1_doc.i"
%{
-#include "gnuradio/blocks/skiphead.h"
-#include "gnuradio/blocks/stream_mux.h"
-#include "gnuradio/blocks/stream_to_streams.h"
-#include "gnuradio/blocks/stream_to_tagged_stream.h"
-#include "gnuradio/blocks/stream_to_vector.h"
-#include "gnuradio/blocks/streams_to_stream.h"
-#include "gnuradio/blocks/streams_to_vector.h"
-#include "gnuradio/blocks/tag_debug.h"
-#include "gnuradio/blocks/tagged_file_sink.h"
-#include "gnuradio/blocks/tsb_vector_sink_b.h"
-#include "gnuradio/blocks/tsb_vector_sink_c.h"
-#include "gnuradio/blocks/tsb_vector_sink_f.h"
-#include "gnuradio/blocks/tsb_vector_sink_i.h"
-#include "gnuradio/blocks/tsb_vector_sink_s.h"
-#include "gnuradio/blocks/throttle.h"
#include "gnuradio/blocks/vector_map.h"
#include "gnuradio/blocks/vector_to_stream.h"
#include "gnuradio/blocks/vector_to_streams.h"
@@ -64,21 +50,6 @@
#include "gnuradio/blocks/wavfile_source.h"
%}
-%include "gnuradio/blocks/skiphead.h"
-%include "gnuradio/blocks/stream_mux.h"
-%include "gnuradio/blocks/stream_to_streams.h"
-%include "gnuradio/blocks/stream_to_tagged_stream.h"
-%include "gnuradio/blocks/stream_to_vector.h"
-%include "gnuradio/blocks/streams_to_stream.h"
-%include "gnuradio/blocks/streams_to_vector.h"
-%include "gnuradio/blocks/tag_debug.h"
-%include "gnuradio/blocks/tagged_file_sink.h"
-%include "gnuradio/blocks/tsb_vector_sink_b.h"
-%include "gnuradio/blocks/tsb_vector_sink_c.h"
-%include "gnuradio/blocks/tsb_vector_sink_f.h"
-%include "gnuradio/blocks/tsb_vector_sink_i.h"
-%include "gnuradio/blocks/tsb_vector_sink_s.h"
-%include "gnuradio/blocks/throttle.h"
%include "gnuradio/blocks/vector_map.h"
%include "gnuradio/blocks/vector_to_stream.h"
%include "gnuradio/blocks/vector_to_streams.h"
@@ -100,21 +71,6 @@
%include "gnuradio/blocks/wavfile_sink.h"
%include "gnuradio/blocks/wavfile_source.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, skiphead);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_tagged_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, throttle);
GR_SWIG_BLOCK_MAGIC2(blocks, vector_map);
GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream);
GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams);
diff --git a/gr-blocks/swig/blocks_swig10.i b/gr-blocks/swig/blocks_swig10.i
new file mode 100644
index 0000000..5872b17
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig10.i
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2017 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 BLOCKS_API
+
+%include "gnuradio.i"
+
+//load generated python docstrings
+%include "blocks_swig10_doc.i"
+
+%{
+#include "gnuradio/blocks/min_ff.h"
+#include "gnuradio/blocks/min_ii.h"
+#include "gnuradio/blocks/min_ss.h"
+#include "gnuradio/blocks/moving_average_cc.h"
+#include "gnuradio/blocks/moving_average_ff.h"
+#include "gnuradio/blocks/moving_average_ii.h"
+#include "gnuradio/blocks/moving_average_ss.h"
+#include "gnuradio/blocks/nlog10_ff.h"
+#include "gnuradio/blocks/not_bb.h"
+#include "gnuradio/blocks/not_ss.h"
+#include "gnuradio/blocks/not_ii.h"
+#include "gnuradio/blocks/or_bb.h"
+#include "gnuradio/blocks/or_ss.h"
+#include "gnuradio/blocks/or_ii.h"
+#include "gnuradio/blocks/patterned_interleaver.h"
+#include "gnuradio/blocks/pack_k_bits_bb.h"
+#include "gnuradio/blocks/packed_to_unpacked_bb.h"
+#include "gnuradio/blocks/packed_to_unpacked_ss.h"
+#include "gnuradio/blocks/packed_to_unpacked_ii.h"
+%}
+
+%include "gnuradio/blocks/min_ff.h"
+%include "gnuradio/blocks/min_ii.h"
+%include "gnuradio/blocks/min_ss.h"
+%include "gnuradio/blocks/moving_average_cc.h"
+%include "gnuradio/blocks/moving_average_ff.h"
+%include "gnuradio/blocks/moving_average_ii.h"
+%include "gnuradio/blocks/moving_average_ss.h"
+%include "gnuradio/blocks/nlog10_ff.h"
+%include "gnuradio/blocks/not_bb.h"
+%include "gnuradio/blocks/not_ss.h"
+%include "gnuradio/blocks/not_ii.h"
+%include "gnuradio/blocks/or_bb.h"
+%include "gnuradio/blocks/or_ss.h"
+%include "gnuradio/blocks/or_ii.h"
+%include "gnuradio/blocks/patterned_interleaver.h"
+%include "gnuradio/blocks/pack_k_bits_bb.h"
+%include "gnuradio/blocks/packed_to_unpacked_bb.h"
+%include "gnuradio/blocks/packed_to_unpacked_ss.h"
+%include "gnuradio/blocks/packed_to_unpacked_ii.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, min_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, min_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, min_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
+GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii);
diff --git a/gr-blocks/swig/blocks_swig2.i b/gr-blocks/swig/blocks_swig2.i
index 92db800..ea25a6b 100644
--- a/gr-blocks/swig/blocks_swig2.i
+++ b/gr-blocks/swig/blocks_swig2.i
@@ -31,26 +31,6 @@
%include "feval.i"
%{
-#include "gnuradio/blocks/abs_ff.h"
-#include "gnuradio/blocks/abs_ss.h"
-#include "gnuradio/blocks/abs_ii.h"
-#include "gnuradio/blocks/add_ff.h"
-#include "gnuradio/blocks/add_ss.h"
-#include "gnuradio/blocks/add_ii.h"
-#include "gnuradio/blocks/add_cc.h"
-#include "gnuradio/blocks/add_const_bb.h"
-#include "gnuradio/blocks/add_const_ff.h"
-#include "gnuradio/blocks/add_const_ss.h"
-#include "gnuradio/blocks/add_const_ii.h"
-#include "gnuradio/blocks/add_const_cc.h"
-#include "gnuradio/blocks/add_const_vbb.h"
-#include "gnuradio/blocks/add_const_vff.h"
-#include "gnuradio/blocks/add_const_vss.h"
-#include "gnuradio/blocks/add_const_vii.h"
-#include "gnuradio/blocks/add_const_vcc.h"
-#include "gnuradio/blocks/and_bb.h"
-#include "gnuradio/blocks/and_ss.h"
-#include "gnuradio/blocks/and_ii.h"
#include "gnuradio/blocks/and_const_bb.h"
#include "gnuradio/blocks/and_const_ss.h"
#include "gnuradio/blocks/and_const_ii.h"
@@ -72,33 +52,8 @@
#include "gnuradio/blocks/complex_to_mag_squared.h"
#include "gnuradio/blocks/complex_to_arg.h"
#include "gnuradio/blocks/conjugate_cc.h"
-#include "gnuradio/blocks/deinterleave.h"
-#include "gnuradio/blocks/divide_ff.h"
-#include "gnuradio/blocks/divide_ss.h"
-#include "gnuradio/blocks/divide_ii.h"
-#include "gnuradio/blocks/divide_cc.h"
%}
-%include "gnuradio/blocks/abs_ff.h"
-%include "gnuradio/blocks/abs_ss.h"
-%include "gnuradio/blocks/abs_ii.h"
-%include "gnuradio/blocks/add_ff.h"
-%include "gnuradio/blocks/add_ss.h"
-%include "gnuradio/blocks/add_ii.h"
-%include "gnuradio/blocks/add_cc.h"
-%include "gnuradio/blocks/add_const_bb.h"
-%include "gnuradio/blocks/add_const_ff.h"
-%include "gnuradio/blocks/add_const_ss.h"
-%include "gnuradio/blocks/add_const_ii.h"
-%include "gnuradio/blocks/add_const_cc.h"
-%include "gnuradio/blocks/add_const_vbb.h"
-%include "gnuradio/blocks/add_const_vff.h"
-%include "gnuradio/blocks/add_const_vss.h"
-%include "gnuradio/blocks/add_const_vii.h"
-%include "gnuradio/blocks/add_const_vcc.h"
-%include "gnuradio/blocks/and_bb.h"
-%include "gnuradio/blocks/and_ss.h"
-%include "gnuradio/blocks/and_ii.h"
%include "gnuradio/blocks/and_const_bb.h"
%include "gnuradio/blocks/and_const_ss.h"
%include "gnuradio/blocks/and_const_ii.h"
@@ -120,32 +75,7 @@
%include "gnuradio/blocks/complex_to_mag_squared.h"
%include "gnuradio/blocks/complex_to_arg.h"
%include "gnuradio/blocks/conjugate_cc.h"
-%include "gnuradio/blocks/deinterleave.h"
-%include "gnuradio/blocks/divide_ff.h"
-%include "gnuradio/blocks/divide_ss.h"
-%include "gnuradio/blocks/divide_ii.h"
-%include "gnuradio/blocks/divide_cc.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, abs_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, abs_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, abs_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ii);
GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb);
GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii);
@@ -167,8 +97,3 @@ GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag);
GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared);
GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg);
GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
diff --git a/gr-blocks/swig/blocks_swig3.i b/gr-blocks/swig/blocks_swig3.i
index 629ada5..6794b75 100644
--- a/gr-blocks/swig/blocks_swig3.i
+++ b/gr-blocks/swig/blocks_swig3.i
@@ -28,33 +28,6 @@
%include "blocks_swig3_doc.i"
%{
-#include "gnuradio/blocks/float_to_char.h"
-#include "gnuradio/blocks/float_to_complex.h"
-#include "gnuradio/blocks/magphase_to_complex.h"
-#include "gnuradio/blocks/float_to_int.h"
-#include "gnuradio/blocks/float_to_short.h"
-#include "gnuradio/blocks/float_to_uchar.h"
-#include "gnuradio/blocks/int_to_float.h"
-#include "gnuradio/blocks/integrate_ss.h"
-#include "gnuradio/blocks/integrate_ii.h"
-#include "gnuradio/blocks/integrate_ff.h"
-#include "gnuradio/blocks/integrate_cc.h"
-#include "gnuradio/blocks/interleave.h"
-#include "gnuradio/blocks/interleaved_short_to_complex.h"
-#include "gnuradio/blocks/interleaved_char_to_complex.h"
-#include "gnuradio/blocks/keep_m_in_n.h"
-#include "gnuradio/blocks/keep_one_in_n.h"
-#include "gnuradio/blocks/lfsr_32k_source_s.h"
-#include "gnuradio/blocks/max_ff.h"
-#include "gnuradio/blocks/max_ii.h"
-#include "gnuradio/blocks/max_ss.h"
-#include "gnuradio/blocks/min_ff.h"
-#include "gnuradio/blocks/min_ii.h"
-#include "gnuradio/blocks/min_ss.h"
-#include "gnuradio/blocks/moving_average_cc.h"
-#include "gnuradio/blocks/moving_average_ff.h"
-#include "gnuradio/blocks/moving_average_ii.h"
-#include "gnuradio/blocks/moving_average_ss.h"
#include "gnuradio/blocks/multiply_ss.h"
#include "gnuradio/blocks/multiply_ii.h"
#include "gnuradio/blocks/multiply_ff.h"
@@ -77,33 +50,6 @@
#include "gnuradio/blocks/mute_cc.h"
%}
-%include "gnuradio/blocks/float_to_char.h"
-%include "gnuradio/blocks/float_to_complex.h"
-%include "gnuradio/blocks/magphase_to_complex.h"
-%include "gnuradio/blocks/float_to_int.h"
-%include "gnuradio/blocks/float_to_short.h"
-%include "gnuradio/blocks/float_to_uchar.h"
-%include "gnuradio/blocks/int_to_float.h"
-%include "gnuradio/blocks/integrate_ss.h"
-%include "gnuradio/blocks/integrate_ii.h"
-%include "gnuradio/blocks/integrate_ff.h"
-%include "gnuradio/blocks/integrate_cc.h"
-%include "gnuradio/blocks/interleave.h"
-%include "gnuradio/blocks/interleaved_short_to_complex.h"
-%include "gnuradio/blocks/interleaved_char_to_complex.h"
-%include "gnuradio/blocks/keep_m_in_n.h"
-%include "gnuradio/blocks/keep_one_in_n.h"
-%include "gnuradio/blocks/lfsr_32k_source_s.h"
-%include "gnuradio/blocks/max_ff.h"
-%include "gnuradio/blocks/max_ii.h"
-%include "gnuradio/blocks/max_ss.h"
-%include "gnuradio/blocks/min_ff.h"
-%include "gnuradio/blocks/min_ii.h"
-%include "gnuradio/blocks/min_ss.h"
-%include "gnuradio/blocks/moving_average_cc.h"
-%include "gnuradio/blocks/moving_average_ff.h"
-%include "gnuradio/blocks/moving_average_ii.h"
-%include "gnuradio/blocks/moving_average_ss.h"
%include "gnuradio/blocks/multiply_ss.h"
%include "gnuradio/blocks/multiply_ii.h"
%include "gnuradio/blocks/multiply_ff.h"
@@ -125,33 +71,6 @@
%include "gnuradio/blocks/mute_ff.h"
%include "gnuradio/blocks/mute_cc.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, magphase_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar);
-GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_char_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, min_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, min_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, min_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii);
GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff);
diff --git a/gr-blocks/swig/blocks_swig4.i b/gr-blocks/swig/blocks_swig4.i
index 4c2c93e..bb39740 100644
--- a/gr-blocks/swig/blocks_swig4.i
+++ b/gr-blocks/swig/blocks_swig4.i
@@ -31,15 +31,6 @@
%include "blocks_swig4_doc.i"
%{
-#include "gnuradio/blocks/nlog10_ff.h"
-#include "gnuradio/blocks/not_bb.h"
-#include "gnuradio/blocks/not_ss.h"
-#include "gnuradio/blocks/not_ii.h"
-#include "gnuradio/blocks/patterned_interleaver.h"
-#include "gnuradio/blocks/pack_k_bits_bb.h"
-#include "gnuradio/blocks/packed_to_unpacked_bb.h"
-#include "gnuradio/blocks/packed_to_unpacked_ss.h"
-#include "gnuradio/blocks/packed_to_unpacked_ii.h"
#include "gnuradio/blocks/pdu_filter.h"
#include "gnuradio/blocks/pdu_set.h"
#include "gnuradio/blocks/pdu_remove.h"
@@ -60,15 +51,8 @@
#include "gnuradio/blocks/probe_signal_vi.h"
#include "gnuradio/blocks/probe_signal_vf.h"
#include "gnuradio/blocks/probe_signal_vc.h"
-#include "gnuradio/blocks/or_bb.h"
-#include "gnuradio/blocks/or_ss.h"
-#include "gnuradio/blocks/or_ii.h"
%}
-%include "gnuradio/blocks/nlog10_ff.h"
-%include "gnuradio/blocks/not_bb.h"
-%include "gnuradio/blocks/not_ss.h"
-%include "gnuradio/blocks/not_ii.h"
%include "gnuradio/blocks/probe_signal_b.h"
%include "gnuradio/blocks/probe_signal_s.h"
%include "gnuradio/blocks/probe_signal_i.h"
@@ -79,14 +63,6 @@
%include "gnuradio/blocks/probe_signal_vi.h"
%include "gnuradio/blocks/probe_signal_vf.h"
%include "gnuradio/blocks/probe_signal_vc.h"
-%include "gnuradio/blocks/or_bb.h"
-%include "gnuradio/blocks/or_ss.h"
-%include "gnuradio/blocks/or_ii.h"
-%include "gnuradio/blocks/pack_k_bits_bb.h"
-%include "gnuradio/blocks/packed_to_unpacked_bb.h"
-%include "gnuradio/blocks/packed_to_unpacked_ss.h"
-%include "gnuradio/blocks/packed_to_unpacked_ii.h"
-%include "gnuradio/blocks/patterned_interleaver.h"
%include "gnuradio/blocks/pdu_filter.h"
%include "gnuradio/blocks/pdu_set.h"
%include "gnuradio/blocks/pdu_remove.h"
@@ -98,15 +74,6 @@
%include "gnuradio/blocks/plateau_detector_fb.h"
%include "gnuradio/blocks/probe_rate.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
-GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii);
GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb);
GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib);
GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb);
@@ -117,9 +84,6 @@ GR_SWIG_BLOCK_MAGIC2(blocks, pdu_set);
GR_SWIG_BLOCK_MAGIC2(blocks, pdu_remove);
GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b);
GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s);
GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i);
diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig5.i
index 761b0a8..da80483 100644
--- a/gr-blocks/swig/blocks_swig5.i
+++ b/gr-blocks/swig/blocks_swig5.i
@@ -31,6 +31,7 @@
%include "blocks_swig5_doc.i"
%{
+#include "gnuradio/blocks/pdu.h"
#include "gnuradio/blocks/random_pdu.h"
#include "gnuradio/blocks/regenerate_bb.h"
#include "gnuradio/blocks/repack_bits_bb.h"
@@ -50,30 +51,6 @@
#include "gnuradio/blocks/sub_ss.h"
#include "gnuradio/blocks/sub_ii.h"
#include "gnuradio/blocks/sub_cc.h"
-#include "gnuradio/blocks/tag_gate.h"
-#include "gnuradio/blocks/tagged_stream_align.h"
-#include "gnuradio/blocks/tagged_stream_mux.h"
-#include "gnuradio/blocks/tagged_stream_multiply_length.h"
-#include "gnuradio/blocks/tagged_stream_to_pdu.h"
-#include "gnuradio/blocks/tags_strobe.h"
-#include "gnuradio/blocks/tcp_server_sink.h"
-#include "gnuradio/blocks/test_tag_variable_rate_ff.h"
-#include "gnuradio/blocks/threshold_ff.h"
-#include "gnuradio/blocks/transcendental.h"
-#include "gnuradio/blocks/tuntap_pdu.h"
-#include "gnuradio/blocks/uchar_to_float.h"
-#include "gnuradio/blocks/udp_sink.h"
-#include "gnuradio/blocks/udp_source.h"
-#include "gnuradio/blocks/unpack_k_bits.h"
-#include "gnuradio/blocks/unpack_k_bits_bb.h"
-#include "gnuradio/blocks/unpacked_to_packed_bb.h"
-#include "gnuradio/blocks/unpacked_to_packed_ss.h"
-#include "gnuradio/blocks/unpacked_to_packed_ii.h"
-#include "gnuradio/blocks/vco_f.h"
-#include "gnuradio/blocks/vco_c.h"
-#include "gnuradio/blocks/xor_bb.h"
-#include "gnuradio/blocks/xor_ss.h"
-#include "gnuradio/blocks/xor_ii.h"
%}
%include "gnuradio/blocks/random_pdu.h"
@@ -95,30 +72,6 @@
%include "gnuradio/blocks/sub_ss.h"
%include "gnuradio/blocks/sub_ii.h"
%include "gnuradio/blocks/sub_cc.h"
-%include "gnuradio/blocks/tag_gate.h"
-%include "gnuradio/blocks/tagged_stream_align.h"
-%include "gnuradio/blocks/tagged_stream_mux.h"
-%include "gnuradio/blocks/tagged_stream_multiply_length.h"
-%include "gnuradio/blocks/tagged_stream_to_pdu.h"
-%include "gnuradio/blocks/tags_strobe.h"
-%include "gnuradio/blocks/tcp_server_sink.h"
-%include "gnuradio/blocks/test_tag_variable_rate_ff.h"
-%include "gnuradio/blocks/threshold_ff.h"
-%include "gnuradio/blocks/transcendental.h"
-%include "gnuradio/blocks/tuntap_pdu.h"
-%include "gnuradio/blocks/uchar_to_float.h"
-%include "gnuradio/blocks/udp_sink.h"
-%include "gnuradio/blocks/udp_source.h"
-%include "gnuradio/blocks/unpack_k_bits.h"
-%include "gnuradio/blocks/unpack_k_bits_bb.h"
-%include "gnuradio/blocks/unpacked_to_packed_bb.h"
-%include "gnuradio/blocks/unpacked_to_packed_ss.h"
-%include "gnuradio/blocks/unpacked_to_packed_ii.h"
-%include "gnuradio/blocks/vco_f.h"
-%include "gnuradio/blocks/vco_c.h"
-%include "gnuradio/blocks/xor_bb.h"
-%include "gnuradio/blocks/xor_ss.h"
-%include "gnuradio/blocks/xor_ii.h"
GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
@@ -139,26 +92,3 @@ GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff);
GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii);
GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, tag_gate);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_align);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_multiply_length);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, tags_strobe);
-GR_SWIG_BLOCK_MAGIC2(blocks, tcp_server_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, test_tag_variable_rate_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, transcendental);
-GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, vco_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vco_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii);
diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig6.i
similarity index 62%
copy from gr-blocks/swig/blocks_swig5.i
copy to gr-blocks/swig/blocks_swig6.i
index 761b0a8..8c1baa3 100644
--- a/gr-blocks/swig/blocks_swig5.i
+++ b/gr-blocks/swig/blocks_swig6.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
+ * Copyright 2017 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -28,28 +28,9 @@
%include <gnuradio/endianness.h>
//load generated python docstrings
-%include "blocks_swig5_doc.i"
+%include "blocks_swig6_doc.i"
%{
-#include "gnuradio/blocks/random_pdu.h"
-#include "gnuradio/blocks/regenerate_bb.h"
-#include "gnuradio/blocks/repack_bits_bb.h"
-#include "gnuradio/blocks/repeat.h"
-#include "gnuradio/blocks/rms_cf.h"
-#include "gnuradio/blocks/rms_ff.h"
-#include "gnuradio/blocks/rotator_cc.h"
-#include "gnuradio/blocks/sample_and_hold_bb.h"
-#include "gnuradio/blocks/sample_and_hold_ss.h"
-#include "gnuradio/blocks/sample_and_hold_ii.h"
-#include "gnuradio/blocks/sample_and_hold_ff.h"
-#include "gnuradio/blocks/short_to_char.h"
-#include "gnuradio/blocks/short_to_float.h"
-#include "gnuradio/blocks/socket_pdu.h"
-#include "gnuradio/blocks/stretch_ff.h"
-#include "gnuradio/blocks/sub_ff.h"
-#include "gnuradio/blocks/sub_ss.h"
-#include "gnuradio/blocks/sub_ii.h"
-#include "gnuradio/blocks/sub_cc.h"
#include "gnuradio/blocks/tag_gate.h"
#include "gnuradio/blocks/tagged_stream_align.h"
#include "gnuradio/blocks/tagged_stream_mux.h"
@@ -76,25 +57,6 @@
#include "gnuradio/blocks/xor_ii.h"
%}
-%include "gnuradio/blocks/random_pdu.h"
-%include "gnuradio/blocks/regenerate_bb.h"
-%include "gnuradio/blocks/repack_bits_bb.h"
-%include "gnuradio/blocks/repeat.h"
-%include "gnuradio/blocks/rms_cf.h"
-%include "gnuradio/blocks/rms_ff.h"
-%include "gnuradio/blocks/rotator_cc.h"
-%include "gnuradio/blocks/sample_and_hold_bb.h"
-%include "gnuradio/blocks/sample_and_hold_ss.h"
-%include "gnuradio/blocks/sample_and_hold_ii.h"
-%include "gnuradio/blocks/sample_and_hold_ff.h"
-%include "gnuradio/blocks/short_to_char.h"
-%include "gnuradio/blocks/short_to_float.h"
-%include "gnuradio/blocks/socket_pdu.h"
-%include "gnuradio/blocks/stretch_ff.h"
-%include "gnuradio/blocks/sub_ff.h"
-%include "gnuradio/blocks/sub_ss.h"
-%include "gnuradio/blocks/sub_ii.h"
-%include "gnuradio/blocks/sub_cc.h"
%include "gnuradio/blocks/tag_gate.h"
%include "gnuradio/blocks/tagged_stream_align.h"
%include "gnuradio/blocks/tagged_stream_mux.h"
@@ -120,25 +82,6 @@
%include "gnuradio/blocks/xor_ss.h"
%include "gnuradio/blocks/xor_ii.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repeat);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, rotator_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc);
GR_SWIG_BLOCK_MAGIC2(blocks, tag_gate);
GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_align);
GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux);
diff --git a/gr-blocks/swig/blocks_swig1.i b/gr-blocks/swig/blocks_swig7.i
similarity index 50%
copy from gr-blocks/swig/blocks_swig1.i
copy to gr-blocks/swig/blocks_swig7.i
index 24483fc..d48ea83 100644
--- a/gr-blocks/swig/blocks_swig1.i
+++ b/gr-blocks/swig/blocks_swig7.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
+ * Copyright 2017 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -21,12 +21,21 @@
*/
#define BLOCKS_API
+#define GR_RUNTIME_API
%include "gnuradio.i"
-%include "blocks_swig1_doc.i"
+//load generated python docstrings
+%include "blocks_swig7_doc.i"
+
+%include "feval.i"
%{
+#include "gnuradio/blocks/deinterleave.h"
+#include "gnuradio/blocks/divide_ff.h"
+#include "gnuradio/blocks/divide_ss.h"
+#include "gnuradio/blocks/divide_ii.h"
+#include "gnuradio/blocks/divide_cc.h"
#include "gnuradio/blocks/skiphead.h"
#include "gnuradio/blocks/stream_mux.h"
#include "gnuradio/blocks/stream_to_streams.h"
@@ -42,28 +51,13 @@
#include "gnuradio/blocks/tsb_vector_sink_i.h"
#include "gnuradio/blocks/tsb_vector_sink_s.h"
#include "gnuradio/blocks/throttle.h"
-#include "gnuradio/blocks/vector_map.h"
-#include "gnuradio/blocks/vector_to_stream.h"
-#include "gnuradio/blocks/vector_to_streams.h"
-#include "gnuradio/blocks/vector_insert_b.h"
-#include "gnuradio/blocks/vector_insert_s.h"
-#include "gnuradio/blocks/vector_insert_i.h"
-#include "gnuradio/blocks/vector_insert_f.h"
-#include "gnuradio/blocks/vector_insert_c.h"
-#include "gnuradio/blocks/vector_sink_b.h"
-#include "gnuradio/blocks/vector_sink_s.h"
-#include "gnuradio/blocks/vector_sink_i.h"
-#include "gnuradio/blocks/vector_sink_f.h"
-#include "gnuradio/blocks/vector_sink_c.h"
-#include "gnuradio/blocks/vector_source_b.h"
-#include "gnuradio/blocks/vector_source_s.h"
-#include "gnuradio/blocks/vector_source_i.h"
-#include "gnuradio/blocks/vector_source_f.h"
-#include "gnuradio/blocks/vector_source_c.h"
-#include "gnuradio/blocks/wavfile_sink.h"
-#include "gnuradio/blocks/wavfile_source.h"
%}
+%include "gnuradio/blocks/deinterleave.h"
+%include "gnuradio/blocks/divide_ff.h"
+%include "gnuradio/blocks/divide_ss.h"
+%include "gnuradio/blocks/divide_ii.h"
+%include "gnuradio/blocks/divide_cc.h"
%include "gnuradio/blocks/skiphead.h"
%include "gnuradio/blocks/stream_mux.h"
%include "gnuradio/blocks/stream_to_streams.h"
@@ -79,27 +73,12 @@
%include "gnuradio/blocks/tsb_vector_sink_i.h"
%include "gnuradio/blocks/tsb_vector_sink_s.h"
%include "gnuradio/blocks/throttle.h"
-%include "gnuradio/blocks/vector_map.h"
-%include "gnuradio/blocks/vector_to_stream.h"
-%include "gnuradio/blocks/vector_to_streams.h"
-%include "gnuradio/blocks/vector_insert_b.h"
-%include "gnuradio/blocks/vector_insert_s.h"
-%include "gnuradio/blocks/vector_insert_i.h"
-%include "gnuradio/blocks/vector_insert_f.h"
-%include "gnuradio/blocks/vector_insert_c.h"
-%include "gnuradio/blocks/vector_sink_b.h"
-%include "gnuradio/blocks/vector_sink_s.h"
-%include "gnuradio/blocks/vector_sink_i.h"
-%include "gnuradio/blocks/vector_sink_f.h"
-%include "gnuradio/blocks/vector_sink_c.h"
-%include "gnuradio/blocks/vector_source_b.h"
-%include "gnuradio/blocks/vector_source_s.h"
-%include "gnuradio/blocks/vector_source_i.h"
-%include "gnuradio/blocks/vector_source_f.h"
-%include "gnuradio/blocks/vector_source_c.h"
-%include "gnuradio/blocks/wavfile_sink.h"
-%include "gnuradio/blocks/wavfile_source.h"
+GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
GR_SWIG_BLOCK_MAGIC2(blocks, skiphead);
GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux);
GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams);
@@ -115,23 +94,3 @@ GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_f);
GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_i);
GR_SWIG_BLOCK_MAGIC2(blocks, tsb_vector_sink_s);
GR_SWIG_BLOCK_MAGIC2(blocks, throttle);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_map);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source);
diff --git a/gr-blocks/swig/blocks_swig8.i b/gr-blocks/swig/blocks_swig8.i
new file mode 100644
index 0000000..2bf5070
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig8.i
@@ -0,0 +1,93 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2017 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 BLOCKS_API
+
+%include "gnuradio.i"
+
+//load generated python docstrings
+%include "blocks_swig8_doc.i"
+
+%{
+#include "gnuradio/blocks/abs_ff.h"
+#include "gnuradio/blocks/abs_ss.h"
+#include "gnuradio/blocks/abs_ii.h"
+#include "gnuradio/blocks/add_ff.h"
+#include "gnuradio/blocks/add_ss.h"
+#include "gnuradio/blocks/add_ii.h"
+#include "gnuradio/blocks/add_cc.h"
+#include "gnuradio/blocks/add_const_bb.h"
+#include "gnuradio/blocks/add_const_ff.h"
+#include "gnuradio/blocks/add_const_ss.h"
+#include "gnuradio/blocks/add_const_ii.h"
+#include "gnuradio/blocks/add_const_cc.h"
+#include "gnuradio/blocks/add_const_vbb.h"
+#include "gnuradio/blocks/add_const_vff.h"
+#include "gnuradio/blocks/add_const_vss.h"
+#include "gnuradio/blocks/add_const_vii.h"
+#include "gnuradio/blocks/add_const_vcc.h"
+#include "gnuradio/blocks/and_bb.h"
+#include "gnuradio/blocks/and_ss.h"
+#include "gnuradio/blocks/and_ii.h"
+%}
+
+%include "gnuradio/blocks/abs_ff.h"
+%include "gnuradio/blocks/abs_ss.h"
+%include "gnuradio/blocks/abs_ii.h"
+%include "gnuradio/blocks/add_ff.h"
+%include "gnuradio/blocks/add_ss.h"
+%include "gnuradio/blocks/add_ii.h"
+%include "gnuradio/blocks/add_cc.h"
+%include "gnuradio/blocks/add_const_bb.h"
+%include "gnuradio/blocks/add_const_ff.h"
+%include "gnuradio/blocks/add_const_ss.h"
+%include "gnuradio/blocks/add_const_ii.h"
+%include "gnuradio/blocks/add_const_cc.h"
+%include "gnuradio/blocks/add_const_vbb.h"
+%include "gnuradio/blocks/add_const_vff.h"
+%include "gnuradio/blocks/add_const_vss.h"
+%include "gnuradio/blocks/add_const_vii.h"
+%include "gnuradio/blocks/add_const_vcc.h"
+%include "gnuradio/blocks/and_bb.h"
+%include "gnuradio/blocks/and_ss.h"
+%include "gnuradio/blocks/and_ii.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, abs_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, abs_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, abs_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_ii);
diff --git a/gr-blocks/swig/blocks_swig9.i b/gr-blocks/swig/blocks_swig9.i
new file mode 100644
index 0000000..872abd9
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig9.i
@@ -0,0 +1,93 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2017 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 BLOCKS_API
+
+%include "gnuradio.i"
+
+//load generated python docstrings
+%include "blocks_swig9_doc.i"
+
+%{
+#include "gnuradio/blocks/float_to_char.h"
+#include "gnuradio/blocks/float_to_complex.h"
+#include "gnuradio/blocks/magphase_to_complex.h"
+#include "gnuradio/blocks/float_to_int.h"
+#include "gnuradio/blocks/float_to_short.h"
+#include "gnuradio/blocks/float_to_uchar.h"
+#include "gnuradio/blocks/int_to_float.h"
+#include "gnuradio/blocks/integrate_ss.h"
+#include "gnuradio/blocks/integrate_ii.h"
+#include "gnuradio/blocks/integrate_ff.h"
+#include "gnuradio/blocks/integrate_cc.h"
+#include "gnuradio/blocks/interleave.h"
+#include "gnuradio/blocks/interleaved_short_to_complex.h"
+#include "gnuradio/blocks/interleaved_char_to_complex.h"
+#include "gnuradio/blocks/keep_m_in_n.h"
+#include "gnuradio/blocks/keep_one_in_n.h"
+#include "gnuradio/blocks/lfsr_32k_source_s.h"
+#include "gnuradio/blocks/max_ff.h"
+#include "gnuradio/blocks/max_ii.h"
+#include "gnuradio/blocks/max_ss.h"
+%}
+
+%include "gnuradio/blocks/float_to_char.h"
+%include "gnuradio/blocks/float_to_complex.h"
+%include "gnuradio/blocks/magphase_to_complex.h"
+%include "gnuradio/blocks/float_to_int.h"
+%include "gnuradio/blocks/float_to_short.h"
+%include "gnuradio/blocks/float_to_uchar.h"
+%include "gnuradio/blocks/int_to_float.h"
+%include "gnuradio/blocks/integrate_ss.h"
+%include "gnuradio/blocks/integrate_ii.h"
+%include "gnuradio/blocks/integrate_ff.h"
+%include "gnuradio/blocks/integrate_cc.h"
+%include "gnuradio/blocks/interleave.h"
+%include "gnuradio/blocks/interleaved_short_to_complex.h"
+%include "gnuradio/blocks/interleaved_char_to_complex.h"
+%include "gnuradio/blocks/keep_m_in_n.h"
+%include "gnuradio/blocks/keep_one_in_n.h"
+%include "gnuradio/blocks/lfsr_32k_source_s.h"
+%include "gnuradio/blocks/max_ff.h"
+%include "gnuradio/blocks/max_ii.h"
+%include "gnuradio/blocks/max_ss.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, magphase_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar);
+GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, interleave);
+GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_char_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n);
+GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n);
+GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ss);
- [Commit-gnuradio] [gnuradio] 01/13: gr-uhd: select time/clock-sources in uhd_app per motherboard, cleanup normalize_sel code, (continued)
- [Commit-gnuradio] [gnuradio] 01/13: gr-uhd: select time/clock-sources in uhd_app per motherboard, cleanup normalize_sel code, git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 12/13: Merge remote-tracking branch 'mbr0wn/uhd/fix_center_freq', git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 10/13: Merge remote-tracking branch 'michaelld/blocks_swig_split_2', git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 08/13: Merge remote-tracking branch 'noc0lour/uhd_app_norm_sel', git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 13/13: Merge remote-tracking branch 'ejk43/uhd-fft-fixbandwidth', git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 09/13: Merge remote-tracking branch 'mmueller/cmake_dependency_tree', git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 04/13: Refactor DVB-T2 modulator block., git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 05/13: Update DVB-T2 modulator copyright date., git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 02/13: Helped CMake maintain a clear dependency tree, git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 06/13: uhd_fft: Added abs(lo_offset) correction to set_bandwidth command so we dont filter out signal of interest, git, 2017/03/05
- [Commit-gnuradio] [gnuradio] 03/13: blocks: swig: increase split from 5 to 10, to do a native build on low memory systems (e.g., RPi). Amazingly, the single new block added in b49f52f9 broke native build, so the prior split was fragile. This new spit leaves a significant margin for adding new blocks here and there without breaking native builds on low memory systems.,
git <=