9 files changed, 1 insertions, 613 deletions
diff --git a/gr-blocks/grc/CMakeLists.txt b/gr-blocks/grc/CMakeLists.txt
index 96a715a7e4..2dd1481a47 100644
--- a/gr-blocks/grc/CMakeLists.txt
+++ b/gr-blocks/grc/CMakeLists.txt
@@ -28,4 +28,4 @@ if(NOT ENABLE_GR_CTRLPORT)
     )
 endif(NOT ENABLE_GR_CTRLPORT)
 
-install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "blocks_python")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR})
diff --git a/gr-blocks/grc/blks2_error_rate.xml b/gr-blocks/grc/blks2_error_rate.xml
deleted file mode 100644
index c71739f914..0000000000
--- a/gr-blocks/grc/blks2_error_rate.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Error Rate:
-##	Custom blks2 block
-###################################################
- -->
-<block>
-	<name>Error Rate</name>
-	<key>blks2_error_rate</key>
-	<category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.error_rate(
-	type=$type,
-	win_size=$win_size,
-	bits_per_symbol=$bits_per_symbol,
-)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Bit Error Rate</name>
-			<key>'BER'</key>
-			<opt>hide_bps:</opt>
-		</option>
-		<option>
-			<name>Symbol Error Rate</name>
-			<key>'SER'</key>
-			<opt>hide_bps:all</opt>
-		</option>
-	</param>
-	<param>
-		<name>Window Size</name>
-		<key>win_size</key>
-		<value>1000</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Bits per Symbol</name>
-		<key>bits_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-		<hide>$type.hide_bps</hide>
-	</param>
-	<sink>
-		<name>ref</name>
-		<type>byte</type>
-	</sink>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>float</type>
-	</source>
-	<doc>
-Calculate the bit error rate (BER) or the symbol error rate (SER) over a number of samples given by the window size. \
-The actual window size will start at size one and grow to the full window size as new samples arrive. \
-Once the window has reached full size, old samples are shifted out of the window and new samples shfited in.
-
-The error block compares the input byte stream to the reference byte stream. \
-For example, the reference byte stream could be the input to a modulator, \
-and the input byte stream could be the output of a modulator.
-
-Each byte in the incoming stream represents one symbol. \
-The bits per symbol parameter is only useful for calculating the BER.
-	</doc>
-</block>
diff --git a/gr-blocks/grc/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
deleted file mode 100644
index 3442b2cdb8..0000000000
--- a/gr-blocks/grc/blks2_selector.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Selector:
-##	Custom blks2 block
-###################################################
- -->
-<block>
-	<name>Selector</name>
-	<key>blks2_selector</key>
-	<category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.selector(
-	item_size=$type.size*$vlen,
-	num_inputs=$num_inputs,
-	num_outputs=$num_outputs,
-	input_index=$input_index,
-	output_index=$output_index,
-)</make>
-	<callback>set_input_index(int($input_index))</callback>
-	<callback>set_output_index(int($output_index))</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Inputs</name>
-		<key>num_inputs</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Num Outputs</name>
-		<key>num_outputs</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Input Index</name>
-		<key>input_index</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Output Index</name>
-		<key>output_index</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_inputs</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_outputs</nports>
-	</source>
-	<doc>
-Connect the sink at input index to the source at output index. Leave all other ports disconnected.
-	</doc>
-</block>
diff --git a/gr-blocks/grc/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
deleted file mode 100644
index 2bff7e6d45..0000000000
--- a/gr-blocks/grc/blks2_tcp_sink.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##TCP Sink: Custom blks2 block
-###################################################
- -->
-<block>
-	<name>TCP Sink</name>
-	<key>blks2_tcp_sink</key>
-	<category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.tcp_sink(
-	itemsize=$type.size*$vlen,
-	addr=$addr,
-	port=$port,
-	server=$server,
-)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Address</name>
-		<key>addr</key>
-		<value>127.0.0.1</value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Port</name>
-		<key>port</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Mode</name>
-		<key>server</key>
-		<value>False</value>
-		<type>enum</type>
-		<option>
-			<name>Server</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Client</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-		<doc>
-In client mode, we attempt to connect to a server at the given address and port. \
-In server mode, we bind a socket to the given address and port and accept the first client.
-	</doc>
-</block>
diff --git a/gr-blocks/grc/blks2_tcp_source.xml b/gr-blocks/grc/blks2_tcp_source.xml
deleted file mode 100644
index f6cc41015f..0000000000
--- a/gr-blocks/grc/blks2_tcp_source.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##TCP Source: Custom blks2 block
-###################################################
- -->
-<block>
-	<name>TCP Source</name>
-	<key>blks2_tcp_source</key>
-	<category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.tcp_source(
-	itemsize=$type.size*$vlen,
-	addr=$addr,
-	port=$port,
-	server=$server,
-)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Address</name>
-		<key>addr</key>
-		<value>127.0.0.1</value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Port</name>
-		<key>port</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Mode</name>
-		<key>server</key>
-		<value>True</value>
-		<type>enum</type>
-		<option>
-			<name>Server</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Client</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-	<doc>
-In client mode, we attempt to connect to a server at the given address and port. \
-In server mode, we bind a socket to the given address and port and accept the first client.
-	</doc>
-</block>
diff --git a/gr-blocks/grc/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
deleted file mode 100644
index c3f25163b2..0000000000
--- a/gr-blocks/grc/blks2_valve.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Valve:
-##	Custom blks2 block
-###################################################
- -->
-<block>
-	<name>Valve</name>
-	<key>blks2_valve</key>
-	<category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.valve(item_size=$type.size*$vlen, open=bool($open))</make>
-	<callback>set_open(bool($open))</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Open</name>
-		<key>open</key>
-		<value>0</value>
-		<type>raw</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_inputs</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_outputs</nports>
-	</source>
-	<doc>
-Connect output to input when valve is closed (not open).
-	</doc>
-</block>
diff --git a/gr-blocks/grc/blocks_message_burst_source.xml b/gr-blocks/grc/blocks_message_burst_source.xml
deleted file mode 100644
index 7eaef2c514..0000000000
--- a/gr-blocks/grc/blocks_message_burst_source.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Burst Source (the sink port is a message)
-###################################################
- -->
-<block>
-	<name>Message Burst Source</name>
-	<key>blocks_message_burst_source</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import blocks</import>
-	<make>blocks.message_burst_source($type.size*$vlen, $(id)_msgq_in)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>msg</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/gr-blocks/grc/blocks_message_sink.xml b/gr-blocks/grc/blocks_message_sink.xml
deleted file mode 100644
index 0f6de7b4e5..0000000000
--- a/gr-blocks/grc/blocks_message_sink.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Sink (the source port is a message)
-###################################################
- -->
-<block>
-	<name>Message Sink</name>
-	<key>blocks_message_sink</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import blocks</import>
-	<make>blocks.message_sink($type.size*$vlen, $(id)_msgq_out, $dont_block)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Don't Block</name>
-		<key>dont_block</key>
-		<value>False</value>
-		<type>enum</type>
-		<option>
-			<name>Don't Block</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Block</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>msg</type>
-	</source>
-</block>
diff --git a/gr-blocks/grc/blocks_message_source.xml b/gr-blocks/grc/blocks_message_source.xml
deleted file mode 100644
index ecf049b9de..0000000000
--- a/gr-blocks/grc/blocks_message_source.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Source (the sink port is a message)
-###################################################
- -->
-<block>
-	<name>Message Source</name>
-	<key>blocks_message_source</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import blocks</import>
-	<make>blocks.message_source($type.size*$vlen, $(id)_msgq_in)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>msg</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>