[Commit-gnuradio] [gnuradio] 02/10: grc: move blks2 code into gr-blocks and gr-digital

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1d9143b0dbbaba502631326dd42d0bad1290ff93
Author: Sebastian Koslowski <address@hidden>
Date:   Sat Feb 13 21:45:21 2016 +0100

    grc: move blks2 code into gr-blocks and gr-digital
---
 gr-blocks/CMakeLists.txt                                  |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_error_rate.xml        |  0
 {grc/blocks => gr-blocks/grc}/blks2_selector.xml          |  0
 {grc/blocks => gr-blocks/grc}/blks2_tcp_sink.xml          |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_tcp_source.xml        |  0
 {grc/blocks => gr-blocks/grc}/blks2_valve.xml             |  0
 {grc => gr-blocks/python}/grc_gnuradio/CMakeLists.txt     |  8 +++++---
 {grc => gr-blocks/python}/grc_gnuradio/README             |  0
 {grc => gr-blocks/python}/grc_gnuradio/__init__.py        |  0
 {grc => gr-blocks/python}/grc_gnuradio/blks2/__init__.py  | 10 +++++++---
 .../python}/grc_gnuradio/blks2/error_rate.py              |  0
 {grc => gr-blocks/python}/grc_gnuradio/blks2/selector.py  |  0
 {grc => gr-blocks/python}/grc_gnuradio/blks2/tcp.py       |  0
 gr-digital/CMakeLists.txt                                 |  1 +
 {grc/blocks => gr-digital/grc}/blks2_packet_decoder.xml   |  0
 {grc/blocks => gr-digital/grc}/blks2_packet_encoder.xml   |  0
 {grc => gr-digital/python}/grc_gnuradio/CMakeLists.txt    | 15 +++++----------
 {grc => gr-digital/python}/grc_gnuradio/blks2/packet.py   |  0
 grc/CMakeLists.txt                                        |  1 -
 grc/blocks/block_tree.xml                                 | 14 --------------
 20 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 13b41a2..685f573 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -87,6 +87,7 @@ add_subdirectory(lib)
 #endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
      add_subdirectory(python/blocks)
+     add_subdirectory(python/grc_gnuradio)
      add_subdirectory(swig)
      add_subdirectory(grc)
      add_subdirectory(doc)
diff --git a/grc/blocks/blks2_error_rate.xml 
b/gr-blocks/grc/blks2_error_rate.xml
similarity index 100%
rename from grc/blocks/blks2_error_rate.xml
rename to gr-blocks/grc/blks2_error_rate.xml
diff --git a/grc/blocks/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
similarity index 100%
rename from grc/blocks/blks2_selector.xml
rename to gr-blocks/grc/blks2_selector.xml
diff --git a/grc/blocks/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
similarity index 98%
rename from grc/blocks/blks2_tcp_sink.xml
rename to gr-blocks/grc/blks2_tcp_sink.xml
index cfe7b42..46b10a7 100644
--- a/grc/blocks/blks2_tcp_sink.xml
+++ b/gr-blocks/grc/blks2_tcp_sink.xml
@@ -7,6 +7,7 @@
 <block>
        <name>TCP Sink</name>
        <key>blks2_tcp_sink</key>
+       <category>Deprecated</category>
        <import>from grc_gnuradio import blks2 as grc_blks2</import>
        <make>grc_blks2.tcp_sink(
        itemsize=$type.size*$vlen,
diff --git a/grc/blocks/blks2_tcp_source.xml 
b/gr-blocks/grc/blks2_tcp_source.xml
similarity index 100%
rename from grc/blocks/blks2_tcp_source.xml
rename to gr-blocks/grc/blks2_tcp_source.xml
diff --git a/grc/blocks/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
similarity index 100%
rename from grc/blocks/blks2_valve.xml
rename to gr-blocks/grc/blks2_valve.xml
diff --git a/grc/grc_gnuradio/CMakeLists.txt 
b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
similarity index 93%
copy from grc/grc_gnuradio/CMakeLists.txt
copy to gr-blocks/python/grc_gnuradio/CMakeLists.txt
index e992a60..9ff1240 100644
--- a/grc/grc_gnuradio/CMakeLists.txt
+++ b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
@@ -18,18 +18,20 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
+
+include(GrPython)
+
 GR_PYTHON_INSTALL(
     FILES __init__.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
 
 GR_PYTHON_INSTALL(FILES
     blks2/__init__.py
     blks2/error_rate.py
-    blks2/packet.py
     blks2/selector.py
     blks2/tcp.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
diff --git a/grc/grc_gnuradio/README b/gr-blocks/python/grc_gnuradio/README
similarity index 100%
rename from grc/grc_gnuradio/README
rename to gr-blocks/python/grc_gnuradio/README
diff --git a/grc/grc_gnuradio/__init__.py 
b/gr-blocks/python/grc_gnuradio/__init__.py
similarity index 100%
rename from grc/grc_gnuradio/__init__.py
rename to gr-blocks/python/grc_gnuradio/__init__.py
diff --git a/grc/grc_gnuradio/blks2/__init__.py 
b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
similarity index 74%
rename from grc/grc_gnuradio/blks2/__init__.py
rename to gr-blocks/python/grc_gnuradio/blks2/__init__.py
index e6941ab..d3c8210 100644
--- a/grc/grc_gnuradio/blks2/__init__.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
@@ -19,8 +19,12 @@
 #
 
 from selector import selector, valve
-from packet import options, packet_encoder, packet_decoder, \
-    packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
-    packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, 
packet_demod_c
 from error_rate import error_rate
 from tcp import tcp_source, tcp_sink
+
+try:
+    from packet import options, packet_encoder, packet_decoder, \
+        packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
+        packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, 
packet_demod_c
+except ImportError:
+    pass  # only available if gr-digital is install
diff --git a/grc/grc_gnuradio/blks2/error_rate.py 
b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
similarity index 100%
rename from grc/grc_gnuradio/blks2/error_rate.py
rename to gr-blocks/python/grc_gnuradio/blks2/error_rate.py
diff --git a/grc/grc_gnuradio/blks2/selector.py 
b/gr-blocks/python/grc_gnuradio/blks2/selector.py
similarity index 100%
rename from grc/grc_gnuradio/blks2/selector.py
rename to gr-blocks/python/grc_gnuradio/blks2/selector.py
diff --git a/grc/grc_gnuradio/blks2/tcp.py 
b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
similarity index 100%
rename from grc/grc_gnuradio/blks2/tcp.py
rename to gr-blocks/python/grc_gnuradio/blks2/tcp.py
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 7a9f8f6..c6fa079 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -97,6 +97,7 @@ add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/digital)
+    add_subdirectory(python/grc_gnuradio)
     add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
diff --git a/grc/blocks/blks2_packet_decoder.xml 
b/gr-digital/grc/blks2_packet_decoder.xml
similarity index 100%
rename from grc/blocks/blks2_packet_decoder.xml
rename to gr-digital/grc/blks2_packet_decoder.xml
diff --git a/grc/blocks/blks2_packet_encoder.xml 
b/gr-digital/grc/blks2_packet_encoder.xml
similarity index 100%
rename from grc/blocks/blks2_packet_encoder.xml
rename to gr-digital/grc/blks2_packet_encoder.xml
diff --git a/grc/grc_gnuradio/CMakeLists.txt 
b/gr-digital/python/grc_gnuradio/CMakeLists.txt
similarity index 81%
rename from grc/grc_gnuradio/CMakeLists.txt
rename to gr-digital/python/grc_gnuradio/CMakeLists.txt
index e992a60..f021299 100644
--- a/grc/grc_gnuradio/CMakeLists.txt
+++ b/gr-digital/python/grc_gnuradio/CMakeLists.txt
@@ -18,18 +18,13 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
-GR_PYTHON_INSTALL(
-    FILES __init__.py
-    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
-    COMPONENT "grc"
-)
+
+include(GrPython)
+
+# __init__ files come from gr-blocks
 
 GR_PYTHON_INSTALL(FILES
-    blks2/__init__.py
-    blks2/error_rate.py
     blks2/packet.py
-    blks2/selector.py
-    blks2/tcp.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
-    COMPONENT "grc"
+    COMPONENT "digital_python"
 )
diff --git a/grc/grc_gnuradio/blks2/packet.py 
b/gr-digital/python/grc_gnuradio/blks2/packet.py
similarity index 100%
rename from grc/grc_gnuradio/blks2/packet.py
rename to gr-digital/python/grc_gnuradio/blks2/packet.py
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 859b9e9..d05ab51 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -136,7 +136,6 @@ endif(WIN32)
 add_subdirectory(base)
 add_subdirectory(blocks)
 add_subdirectory(freedesktop)
-add_subdirectory(grc_gnuradio)
 add_subdirectory(gui)
 add_subdirectory(python)
 add_subdirectory(scripts)
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index d07c52e..8c30f36 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -21,24 +21,10 @@
       <block>note</block>
       <block>import</block>
 
-      <block>blks2_selector</block>
-      <block>blks2_valve</block>
-      <block>blks2_error_rate</block>
-
       <block>xmlrpc_server</block>
       <block>xmlrpc_client</block>
    </cat>
    <cat>
-      <name>Networking Tools</name>
-      <block>blks2_tcp_source</block>
-      <block>blks2_tcp_sink</block>
-   </cat>
-   <cat>
-      <name>Packet Operators</name>
-      <block>blks2_packet_decoder</block>
-      <block>blks2_packet_encoder</block>
-   </cat>
-   <cat>
       <name>Variables</name>
       <block>variable</block>
       <block>variable_config</block>