summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/grc_gr_usrp.m43
-rw-r--r--config/grc_gr_usrp2.m43
-rw-r--r--gr-usrp/Makefile.am6
-rw-r--r--gr-usrp/grc/.gitignore2
-rw-r--r--gr-usrp/grc/Makefile.am42
-rw-r--r--gr-usrp/grc/__init__.py (renamed from grc/grc_gnuradio/usrp/__init__.py)0
-rw-r--r--gr-usrp/grc/common.py (renamed from grc/grc_gnuradio/usrp/common.py)0
-rw-r--r--gr-usrp/grc/dual_usrp.py (renamed from grc/grc_gnuradio/usrp/dual_usrp.py)0
-rw-r--r--gr-usrp/grc/gnuradio-usrp_probe.desktop (renamed from grc/freedesktop/gnuradio-usrp_probe.desktop)0
-rw-r--r--gr-usrp/grc/simple_usrp.py (renamed from grc/grc_gnuradio/usrp/simple_usrp.py)0
-rw-r--r--gr-usrp/grc/usrp_dual_sink_x.xml (renamed from grc/blocks/usrp_dual_sink_x.xml)3
-rw-r--r--gr-usrp/grc/usrp_dual_source_x.xml (renamed from grc/blocks/usrp_dual_source_x.xml)3
-rwxr-xr-xgr-usrp/grc/usrp_probe (renamed from grc/scripts/usrp_probe)0
-rw-r--r--gr-usrp/grc/usrp_probe.xml (renamed from grc/blocks/usrp_probe.xml)0
-rw-r--r--gr-usrp/grc/usrp_simple_sink_x.xml (renamed from grc/blocks/usrp_simple_sink_x.xml)3
-rw-r--r--gr-usrp/grc/usrp_simple_source_x.xml (renamed from grc/blocks/usrp_simple_source_x.xml)3
-rw-r--r--gr-usrp2/Makefile.am6
-rw-r--r--gr-usrp2/grc/.gitignore2
-rw-r--r--gr-usrp2/grc/Makefile.am33
-rw-r--r--gr-usrp2/grc/gnuradio-usrp2_probe.desktop (renamed from grc/freedesktop/gnuradio-usrp2_probe.desktop)0
-rwxr-xr-xgr-usrp2/grc/usrp2_probe (renamed from grc/scripts/usrp2_probe)0
-rw-r--r--gr-usrp2/grc/usrp2_probe.xml (renamed from grc/blocks/usrp2_probe.xml)0
-rw-r--r--gr-usrp2/grc/usrp2_sink_xxxx.xml (renamed from grc/blocks/usrp2_sink_xxxx.xml)1
-rw-r--r--gr-usrp2/grc/usrp2_source_xxxx.xml (renamed from grc/blocks/usrp2_source_xxxx.xml)1
-rw-r--r--grc/Makefile.am8
-rw-r--r--grc/blocks/Makefile.am8
-rw-r--r--grc/blocks/block_tree.xml9
-rw-r--r--grc/freedesktop/Makefile.am8
-rw-r--r--grc/freedesktop/grc_setup_freedesktop.in11
-rw-r--r--grc/grc_gnuradio/Makefile.am9
-rw-r--r--grc/scripts/Makefile.am4
31 files changed, 115 insertions, 53 deletions
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
index b850f0050..c3d2667ca 100644
--- a/config/grc_gr_usrp.m4
+++ b/config/grc_gr_usrp.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP],[
AC_CONFIG_FILES([ \
gr-usrp/Makefile \
+ gr-usrp/grc/Makefile \
gr-usrp/gnuradio-usrp.pc \
gr-usrp/src/Makefile \
gr-usrp/src/run_tests \
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 5a9bb3b70..3d64db6d6 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
+ gr-usrp2/grc/Makefile \
gr-usrp2/gnuradio-usrp2.pc \
gr-usrp2/src/Makefile \
gr-usrp2/src/run_tests \
diff --git a/gr-usrp/Makefile.am b/gr-usrp/Makefile.am
index 221a10816..be4035dd4 100644
--- a/gr-usrp/Makefile.am
+++ b/gr-usrp/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -27,5 +27,9 @@ EXTRA_DIST += \
SUBDIRS = src apps
+if PYTHON
+SUBDIRS += grc
+endif
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnuradio-usrp.pc
diff --git a/gr-usrp/grc/.gitignore b/gr-usrp/grc/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-usrp/grc/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-usrp/grc/Makefile.am b/gr-usrp/grc/Makefile.am
new file mode 100644
index 000000000..11a5f40dc
--- /dev/null
+++ b/gr-usrp/grc/Makefile.am
@@ -0,0 +1,42 @@
+#
+# Copyright 2011 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+usrp_pythondir = $(pythondir)/grc_gnuradio/usrp
+usrp_python_PYTHON = \
+ __init__.py \
+ common.py \
+ dual_usrp.py \
+ simple_usrp.py
+
+dist_bin_SCRIPTS = usrp_probe
+
+grcblocksdir = $(grc_blocksdir)
+dist_grcblocks_DATA = \
+ usrp_dual_sink_x.xml \
+ usrp_simple_sink_x.xml \
+ usrp_dual_source_x.xml \
+ usrp_simple_source_x.xml \
+ usrp_probe.xml
+
+ourdatadir = $(pkgdatadir)/grc/freedesktop
+dist_ourdata_DATA = gnuradio-usrp_probe.desktop
diff --git a/grc/grc_gnuradio/usrp/__init__.py b/gr-usrp/grc/__init__.py
index 1956bbd5b..1956bbd5b 100644
--- a/grc/grc_gnuradio/usrp/__init__.py
+++ b/gr-usrp/grc/__init__.py
diff --git a/grc/grc_gnuradio/usrp/common.py b/gr-usrp/grc/common.py
index 65c1e7e29..65c1e7e29 100644
--- a/grc/grc_gnuradio/usrp/common.py
+++ b/gr-usrp/grc/common.py
diff --git a/grc/grc_gnuradio/usrp/dual_usrp.py b/gr-usrp/grc/dual_usrp.py
index 66b76b2df..66b76b2df 100644
--- a/grc/grc_gnuradio/usrp/dual_usrp.py
+++ b/gr-usrp/grc/dual_usrp.py
diff --git a/grc/freedesktop/gnuradio-usrp_probe.desktop b/gr-usrp/grc/gnuradio-usrp_probe.desktop
index 136321994..136321994 100644
--- a/grc/freedesktop/gnuradio-usrp_probe.desktop
+++ b/gr-usrp/grc/gnuradio-usrp_probe.desktop
diff --git a/grc/grc_gnuradio/usrp/simple_usrp.py b/gr-usrp/grc/simple_usrp.py
index fb7a39570..fb7a39570 100644
--- a/grc/grc_gnuradio/usrp/simple_usrp.py
+++ b/gr-usrp/grc/simple_usrp.py
diff --git a/grc/blocks/usrp_dual_sink_x.xml b/gr-usrp/grc/usrp_dual_sink_x.xml
index 4539b62f9..babc124d0 100644
--- a/grc/blocks/usrp_dual_sink_x.xml
+++ b/gr-usrp/grc/usrp_dual_sink_x.xml
@@ -5,8 +5,9 @@
###################################################
-->
<block>
- <name>USRP Dual Sink</name>
+ <name>USRP1 Dual Sink</name>
<key>usrp_dual_sink_x</key>
+ <category>USRP</category>
<import>from grc_gnuradio import usrp as grc_usrp</import>
<make>grc_usrp.dual_sink_$(type.fcn)(which=$which)
self.$(id).set_interp_rate($interpolation)
diff --git a/grc/blocks/usrp_dual_source_x.xml b/gr-usrp/grc/usrp_dual_source_x.xml
index 07d3174bb..4e1fa81d8 100644
--- a/grc/blocks/usrp_dual_source_x.xml
+++ b/gr-usrp/grc/usrp_dual_source_x.xml
@@ -5,8 +5,9 @@
###################################################
-->
<block>
- <name>USRP Dual Source</name>
+ <name>USRP1 Dual Source</name>
<key>usrp_dual_source_x</key>
+ <category>USRP</category>
<import>from grc_gnuradio import usrp as grc_usrp</import>
<make>grc_usrp.dual_source_$(type.fcn)(
which=$which,
diff --git a/grc/scripts/usrp_probe b/gr-usrp/grc/usrp_probe
index d2e92e753..d2e92e753 100755
--- a/grc/scripts/usrp_probe
+++ b/gr-usrp/grc/usrp_probe
diff --git a/grc/blocks/usrp_probe.xml b/gr-usrp/grc/usrp_probe.xml
index ee207c28d..ee207c28d 100644
--- a/grc/blocks/usrp_probe.xml
+++ b/gr-usrp/grc/usrp_probe.xml
diff --git a/grc/blocks/usrp_simple_sink_x.xml b/gr-usrp/grc/usrp_simple_sink_x.xml
index b52cd4880..e52b5f047 100644
--- a/grc/blocks/usrp_simple_sink_x.xml
+++ b/gr-usrp/grc/usrp_simple_sink_x.xml
@@ -5,8 +5,9 @@
###################################################
-->
<block>
- <name>USRP Sink</name>
+ <name>USRP1 Sink</name>
<key>usrp_simple_sink_x</key>
+ <category>USRP</category>
<import>from grc_gnuradio import usrp as grc_usrp</import>
<make>grc_usrp.simple_sink_$(type.fcn)(which=$which, side=$side)
self.$(id).set_interp_rate($interpolation)
diff --git a/grc/blocks/usrp_simple_source_x.xml b/gr-usrp/grc/usrp_simple_source_x.xml
index 7fcc7a22c..a79c78c20 100644
--- a/grc/blocks/usrp_simple_source_x.xml
+++ b/gr-usrp/grc/usrp_simple_source_x.xml
@@ -5,8 +5,9 @@
###################################################
-->
<block>
- <name>USRP Source</name>
+ <name>USRP1 Source</name>
<key>usrp_simple_source_x</key>
+ <category>USRP</category>
<import>from grc_gnuradio import usrp as grc_usrp</import>
<make>grc_usrp.simple_source_$(type.fcn)(which=$which, side=$side, rx_ant=$rx_ant#if $hb_filters() then ', no_hb=True' else ''#)
#if $format()
diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am
index 2a0fbe203..f6120884a 100644
--- a/gr-usrp2/Makefile.am
+++ b/gr-usrp2/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009,2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,5 +23,9 @@ include $(top_srcdir)/Makefile.common
SUBDIRS = src
+if PYTHON
+SUBDIRS += grc
+endif
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnuradio-usrp2.pc
diff --git a/gr-usrp2/grc/.gitignore b/gr-usrp2/grc/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-usrp2/grc/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-usrp2/grc/Makefile.am b/gr-usrp2/grc/Makefile.am
new file mode 100644
index 000000000..2502bf363
--- /dev/null
+++ b/gr-usrp2/grc/Makefile.am
@@ -0,0 +1,33 @@
+#
+# Copyright 2011 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+dist_bin_SCRIPTS = usrp2_probe
+
+grcblocksdir = $(grc_blocksdir)
+dist_grcblocks_DATA = \
+ usrp2_probe.xml \
+ usrp2_source_xxxx.xml \
+ usrp2_sink_xxxx.xml
+
+ourdatadir = $(pkgdatadir)/grc/freedesktop
+dist_ourdata_DATA = gnuradio-usrp2_probe.desktop
diff --git a/grc/freedesktop/gnuradio-usrp2_probe.desktop b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop
index c71a092b1..c71a092b1 100644
--- a/grc/freedesktop/gnuradio-usrp2_probe.desktop
+++ b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop
diff --git a/grc/scripts/usrp2_probe b/gr-usrp2/grc/usrp2_probe
index 38c8f655c..38c8f655c 100755
--- a/grc/scripts/usrp2_probe
+++ b/gr-usrp2/grc/usrp2_probe
diff --git a/grc/blocks/usrp2_probe.xml b/gr-usrp2/grc/usrp2_probe.xml
index cc3f9c2fd..cc3f9c2fd 100644
--- a/grc/blocks/usrp2_probe.xml
+++ b/gr-usrp2/grc/usrp2_probe.xml
diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/gr-usrp2/grc/usrp2_sink_xxxx.xml
index f9fb25361..74995da99 100644
--- a/grc/blocks/usrp2_sink_xxxx.xml
+++ b/gr-usrp2/grc/usrp2_sink_xxxx.xml
@@ -8,6 +8,7 @@
<block>
<name>USRP2 Sink</name>
<key>usrp2_sink_xxxx</key>
+ <category>USRP</category>
<import>from gnuradio import usrp2</import>
<make>#if not $interface() and not $mac_addr()
usrp2.sink_$(type.fcn)()
diff --git a/grc/blocks/usrp2_source_xxxx.xml b/gr-usrp2/grc/usrp2_source_xxxx.xml
index 584199798..a23c5bc5c 100644
--- a/grc/blocks/usrp2_source_xxxx.xml
+++ b/gr-usrp2/grc/usrp2_source_xxxx.xml
@@ -8,6 +8,7 @@
<block>
<name>USRP2 Source</name>
<key>usrp2_source_xxxx</key>
+ <category>USRP</category>
<import>from gnuradio import usrp2</import>
<make>#if not $interface() and not $mac_addr()
usrp2.source_$(type.fcn)()
diff --git a/grc/Makefile.am b/grc/Makefile.am
index 330777bb7..c36786281 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008,2009,2010 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,16 +25,12 @@ if PYTHON
SUBDIRS = \
base \
blocks \
+ freedesktop \
grc_gnuradio \
gui \
python \
scripts
-## append freedesktop to the list of subdirs when xdg utils are present
-if XDG_UTILS
-SUBDIRS += freedesktop
-endif
-
ourpythondir = $(pkgpythondir)/grc
ourpython_PYTHON = __init__.py
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 18420a013..517792453 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -212,14 +212,6 @@ dist_ourdata_DATA = \
trellis_siso_f.xml \
trellis_viterbi_combined_xx.xml \
trellis_viterbi_x.xml \
- usrp2_probe.xml \
- usrp2_sink_xxxx.xml \
- usrp2_source_xxxx.xml \
- usrp_dual_sink_x.xml \
- usrp_dual_source_x.xml \
- usrp_probe.xml \
- usrp_simple_sink_x.xml \
- usrp_simple_source_x.xml \
variable.xml \
variable_check_box.xml \
variable_chooser.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 610a88102..e18944bce 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -274,15 +274,6 @@
<block>probe_function</block>
</cat>
<cat>
- <name>USRP</name>
- <block>usrp_simple_source_x</block>
- <block>usrp_simple_sink_x</block>
- <block>usrp_dual_source_x</block>
- <block>usrp_dual_sink_x</block>
- <block>usrp2_source_xxxx</block>
- <block>usrp2_sink_xxxx</block>
- </cat>
- <cat>
<name>Variables</name>
<block>variable</block>
<block>variable_slider</block>
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index dd7411bbb..f89a344f7 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -29,9 +29,7 @@ dist_ourdata_DATA = \
grc-icon-48.png \
grc-icon-32.png \
gnuradio-grc.xml \
- gnuradio-grc.desktop \
- gnuradio-usrp2_probe.desktop \
- gnuradio-usrp_probe.desktop
+ gnuradio-grc.desktop
pkglibexecdir = $(libexecdir)/$(PACKAGE)
dist_pkglibexec_SCRIPTS = grc_setup_freedesktop
@@ -42,6 +40,7 @@ grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile
EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in
BUILT_SOURCES += grc_setup_freedesktop
+if XDG_UTILS
install-data-hook:
@printf "\n*** GRC Post-Install Message ***\
\nTo install icons, mime type, and menu items\
@@ -53,3 +52,4 @@ uninstall-hook:
\nTo uninstall icons, mime type, and menu items\
\nfor a freedesktop.org system (Gnome/KDE/Xfce):\
\n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop uninstall\n\n"
+endif
diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in
index ab4ce82ef..1e3546197 100644
--- a/grc/freedesktop/grc_setup_freedesktop.in
+++ b/grc/freedesktop/grc_setup_freedesktop.in
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -28,7 +28,6 @@
##################################################
ICON_SIZES="32 48 64 128 256"
-MENU_ITEMS="grc usrp2_probe usrp_probe"
if [ -n "$2" ]; then
SRCDIR="$2"
else
@@ -49,9 +48,7 @@ case "$1" in
echo "Install mime type"
xdg-mime install ${SRCDIR}/gnuradio-grc.xml
echo "Install menu items"
- for menu_item in ${MENU_ITEMS}; do \
- xdg-desktop-menu install ${SRCDIR}/gnuradio-${menu_item}.desktop; \
- done
+ xdg-desktop-menu install ${SRCDIR}/*.desktop
echo "Done!"
echo ""
;;
@@ -68,9 +65,7 @@ case "$1" in
echo "Uninstall mime type"
xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml
echo "Uninstall menu items"
- for menu_item in ${MENU_ITEMS}; do \
- xdg-desktop-menu uninstall gnuradio-${menu_item}.desktop; \
- done
+ xdg-desktop-menu uninstall `ls ${SRCDIR}/*.desktop | xargs -n1 basename`
echo "Done!"
echo ""
;;
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 \
diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am
index 9019ec5cc..84e2759dc 100644
--- a/grc/scripts/Makefile.am
+++ b/grc/scripts/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,4 +21,4 @@
include $(top_srcdir)/Makefile.common
-dist_bin_SCRIPTS = gnuradio-companion usrp2_probe usrp_probe
+dist_bin_SCRIPTS = gnuradio-companion
generated by cgit (git 2.34.1) at 2024-12-20 18:03:36 +0000