From f0537a7da4571bd6aaab273a0588eaef04121648 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 21 Jan 2011 15:20:45 -0800
Subject: grc: moved wxgui blocks and python into gr-wxgui/grc

Prefixed wxgui blocks with WX GUI in the block names.
Added category to wxgui variables blocks (not in the main block tree.xml)
---
 grc/grc_gnuradio/Makefile.am | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'grc/grc_gnuradio/Makefile.am')

diff --git a/grc/grc_gnuradio/Makefile.am b/grc/grc_gnuradio/Makefile.am
index 63bb72822..c53d07b4e 100644
--- a/grc/grc_gnuradio/Makefile.am
+++ b/grc/grc_gnuradio/Makefile.am
@@ -42,9 +42,3 @@ usrp_python_PYTHON = \
 	usrp/common.py \
 	usrp/dual_usrp.py \
 	usrp/simple_usrp.py
-
-wxgui_pythondir = $(grc_gnuradio_prefix)/wxgui
-wxgui_python_PYTHON = \
-	wxgui/__init__.py \
-	wxgui/panel.py \
-	wxgui/top_block_gui.py
-- 
cgit 


From 7070c10d7ac59adcd597c18ec2c83b1b59ed87e9 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 6 Mar 2011 11:18:27 -0800
Subject: grc: rework the probe blocks and how they fit into grc

Removed the source on all probe blocks.
Advertise the probe-able function in the docs.
Added missing signal probe block.
Removed probe function and variable sink blocks.
Removed all supporting grc_gnuradio python files.

Added variable_function_probe block that can probe arbitrary functions on a block.
All the code needed by the function probe is available is the make tag.

To display the value of a probe block, use the variable probe block, and a gui widget.
To disply the value of a stream, do the same but use the signal probe block.
Simple see :-)

If more types other than floats need to be read from the stream,
the signal probe should be extended.
---
 grc/grc_gnuradio/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'grc/grc_gnuradio/Makefile.am')

diff --git a/grc/grc_gnuradio/Makefile.am b/grc/grc_gnuradio/Makefile.am
index c53d07b4e..c70972f59 100644
--- a/grc/grc_gnuradio/Makefile.am
+++ b/grc/grc_gnuradio/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -31,10 +31,8 @@ blks2_python_PYTHON = \
 	blks2/__init__.py \
 	blks2/error_rate.py \
 	blks2/packet.py \
-	blks2/probe.py \
 	blks2/selector.py \
-	blks2/tcp.py \
-	blks2/variable_sink.py
+	blks2/tcp.py
 
 usrp_pythondir = $(grc_gnuradio_prefix)/usrp
 usrp_python_PYTHON = \
-- 
cgit 


From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Mar 2011 17:33:33 -0700
Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc

Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files.

When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change.

Minor change: the freedesktop files are always installed now.
This does not mean that they are installed properly with xdg,
it just means that the runtime can have access to the icons.
---
 grc/grc_gnuradio/Makefile.am | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'grc/grc_gnuradio/Makefile.am')

diff --git a/grc/grc_gnuradio/Makefile.am b/grc/grc_gnuradio/Makefile.am
index 63bb72822..9187a01e0 100644
--- a/grc/grc_gnuradio/Makefile.am
+++ b/grc/grc_gnuradio/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -36,13 +36,6 @@ blks2_python_PYTHON = \
 	blks2/tcp.py \
 	blks2/variable_sink.py
 
-usrp_pythondir = $(grc_gnuradio_prefix)/usrp
-usrp_python_PYTHON = \
-	usrp/__init__.py \
-	usrp/common.py \
-	usrp/dual_usrp.py \
-	usrp/simple_usrp.py
-
 wxgui_pythondir = $(grc_gnuradio_prefix)/wxgui
 wxgui_python_PYTHON = \
 	wxgui/__init__.py \
-- 
cgit