grc: added yaml/mako support

Includes basic converter from XML/Cheetah to YAML/Mako based block format.

Author: skoslowski

gr-digital/examples/demod/pam_timing.grc

@@ -32,12 +32,6 @@ GR_PYTHON_CHECK_MODULE_RAW(
     PYTHON_MIN_VER_FOUND
 )
 
-GR_PYTHON_CHECK_MODULE_RAW(
-    "Cheetah >= 2.0.0"
-    "import Cheetah; assert Cheetah.Version >= '2.0.0'"
-    CHEETAH_FOUND
-)
-
 GR_PYTHON_CHECK_MODULE_RAW(
     "PyYAML >= 3.10"
     "import yaml; assert yaml.__version__ >= '3.11'"
@@ -94,7 +88,8 @@ include(GrComponent)
 if(NOT CMAKE_CROSSCOMPILING)
     set(grc_python_deps
         PYTHON_MIN_VER_FOUND
-        CHEETAH_FOUND
+        PYYAML_FOUND
+        MAKO_FOUND
         LXML_FOUND
         PYGI_FOUND
         GTK_GI_FOUND

grc/CMakeLists.txt

@@ -8,12 +8,6 @@
       <block>virtual_source</block>
       <block>virtual_sink</block>
 
-      <block>bus_sink</block>
-      <block>bus_source</block>
-      <block>bus_structure_sink</block>
-      <block>bus_structure_source</block>
-
-      <block>epy_block</block>
       <block>epy_module</block>
 
       <block>note</block>

grc/blocks/block_tree.xml

@@ -7,11 +7,11 @@
 <block>
 	<name>Import</name>
 	<key>import</key>
-	<import>$import</import>
+	<import>$imports</import>
 	<make></make>
 	<param>
 		<name>Import</name>
-		<key>import</key>
+		<key>imports</key>
 		<value></value>
 		<type>import</type>
 	</param>

grc/blocks/bus_sink.xml

@@ -0,0 +1,10 @@
+id: message
+label: Message
+color: "#FFFFFF"
+
+multiple_connections_per_input: true
+multiple_connections_per_output: true
+
+templates:
+-   type: [message, message]
+    connect: self.msg_connect(${ make_port_sig(source) }, ${ make_port_sig(sink) })

grc/blocks/bus_source.xml

@@ -100,7 +100,7 @@ else: self.stop(); self.wait()</callback>
 		<key>run</key>
 		<value>True</value>
 		<type>bool</type>
-		<hide>#if $generate_options() == 'qt_gui' then ('part' if $run() else 'none') else 'all'#</hide>
+		<hide>#if $generate_options() != 'qt_gui' then 'all' else ('part' if $run() else 'none')#</hide>
 		<option>
 			<name>Autostart</name>
 			<key>True</key>
@@ -137,7 +137,7 @@ else: self.stop(); self.wait()</callback>
 		<key>qt_qss_theme</key>
 		<value></value>
 		<type>file_open</type>
-		<hide>#if $generate_options() == 'qt_gui' then ('none' if $qt_qss_theme() else 'part') else 'all'#</hide>
+		<hide>#if $generate_options() != 'qt_gui' then 'all' else ('none' if $qt_qss_theme() else 'part')#</hide>
 	</param>
 	<param>
 		<name>Thread-safe setters</name>

grc/blocks/bus_structure_sink.xml

@@ -0,0 +1,10 @@
+id: stream
+label: Stream
+color: "#000000"
+
+multiple_connections_per_input: false
+multiple_connections_per_output: true
+
+templates:
+-   type: [stream, stream]
+    connect: self.connect(${ make_port_sig(source) }, ${ make_port_sig(sink) })

grc/blocks/bus_structure_source.xml

@@ -26,7 +26,7 @@
 from gnuradio import gr
 
 from .core import Messages
-from .core.Platform import Platform
+from .core.platform import Platform
 
 
 def argument_parser():
@@ -53,6 +53,8 @@ def main(args=None):
         version=gr.version(),
         version_parts=(gr.major_version(), gr.api_version(), gr.minor_version())
     )
+    platform.build_library()
+
     out_dir = args.output if not args.user_lib_dir else platform.config.hier_block_lib_dir
     if os.path.exists(out_dir):
         pass  # all is well

grc/blocks/epy_block.xml

@@ -0,0 +1,20 @@
+# Copyright 2016 Free Software Foundation, Inc.
+# This file is part of GNU Radio
+#
+# GNU Radio Companion 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 2 of the License, or (at your
+# option) any later version.
+#
+# GNU Radio Companion 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
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+from __future__ import absolute_import
+
+from .main import Converter

grc/blocks/epy_module.xml

@@ -0,0 +1,21 @@
+# Copyright 2016 Free Software Foundation, Inc.
+# This file is part of GNU Radio
+#
+# GNU Radio Companion 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 2 of the License, or (at your
+# option) any later version.
+#
+# GNU Radio Companion 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
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+from __future__ import absolute_import
+
+# TODO: implement cli
+