diff options
Diffstat (limited to 'gr-uhd')
28 files changed, 7 insertions, 681 deletions
diff --git a/gr-uhd/.gitignore b/gr-uhd/.gitignore deleted file mode 100644 index a37fc0c1a..000000000 --- a/gr-uhd/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pc diff --git a/gr-uhd/Makefile.am b/gr-uhd/Makefile.am deleted file mode 100644 index 56829e9c4..000000000 --- a/gr-uhd/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2010-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 - -SUBDIRS = include lib apps examples doc - -if PYTHON -SUBDIRS += swig grc -endif - -pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gnuradio-uhd.pc diff --git a/gr-uhd/apps/.gitignore b/gr-uhd/apps/.gitignore deleted file mode 100644 index 22a4e7292..000000000 --- a/gr-uhd/apps/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in - diff --git a/gr-uhd/apps/Makefile.am b/gr-uhd/apps/Makefile.am deleted file mode 100644 index c30a143c2..000000000 --- a/gr-uhd/apps/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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 - -EXTRA_DIST += \ - $(bin_SCRIPTS) - -SUBDIRS = hf_explorer hf_radio - -ourpythondir = $(grpythondir) - -bin_SCRIPTS = \ - uhd_fft.py \ - uhd_rx_cfile.py \ - uhd_siggen.py \ - uhd_siggen_gui.py \ - uhd_rx_nogui.py diff --git a/gr-uhd/apps/hf_explorer/.gitignore b/gr-uhd/apps/hf_explorer/.gitignore deleted file mode 100644 index b6950912c..000000000 --- a/gr-uhd/apps/hf_explorer/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pyc diff --git a/gr-uhd/apps/hf_explorer/Makefile.am b/gr-uhd/apps/hf_explorer/Makefile.am deleted file mode 100644 index c8e7ecb25..000000000 --- a/gr-uhd/apps/hf_explorer/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2006,2009 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 - -ourdatadir = $(exampledir)/hf_explorer - -dist_ourdata_DATA = \ - README \ - hfx_help - -dist_ourdata_SCRIPTS = \ - hfx.py diff --git a/gr-uhd/apps/hf_radio/.gitignore b/gr-uhd/apps/hf_radio/.gitignore deleted file mode 100644 index b6950912c..000000000 --- a/gr-uhd/apps/hf_radio/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pyc diff --git a/gr-uhd/apps/hf_radio/Makefile.am b/gr-uhd/apps/hf_radio/Makefile.am deleted file mode 100644 index e514076f6..000000000 --- a/gr-uhd/apps/hf_radio/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2006,2009 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 - -ourdatadir = $(exampledir)/hf_radio - -dist_ourdata_DATA = \ - hfir.sci \ - radio.xml \ - input.py \ - output.py \ - README.TXT \ - ssbagc.py \ - ssbdemod.py \ - startup.py \ - ssb_taps - -dist_ourdata_SCRIPTS = \ - radio.py \ - ui.py diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py index 18edc8f86..39ba3838e 100755 --- a/gr-uhd/apps/uhd_fft.py +++ b/gr-uhd/apps/uhd_fft.py @@ -73,8 +73,8 @@ class app_top_block(stdgui2.std_top_block): help="Set FFT update rate, [default=%default]") parser.add_option("", "--wire-format", type="string", default="sc16", help="Set wire format from USRP [default=%default]") - parser.add_option("", "--scalar", type="int", default=1024, - help="Set scalar multiplier value sc8 wire format [default=%default]") + parser.add_option("", "--stream-args", type="string", default="", + help="Set additional stream args [default=%default]") parser.add_option("", "--show-async-msg", action="store_true", default=False, help="Show asynchronous message notifications from UHD [default=%default]") (options, args) = parser.parse_args() @@ -84,10 +84,9 @@ class app_top_block(stdgui2.std_top_block): self.options = options self.show_debug_info = True - scalar="scalar="+str(options.scalar) self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args(cpu_format='fc32', - otw_format=options.wire_format, args=scalar)) + otw_format=options.wire_format, args=options.stream_args)) # Set the subdevice spec if(options.spec): diff --git a/gr-uhd/apps/uhd_rx_cfile.py b/gr-uhd/apps/uhd_rx_cfile.py index 718bb80b7..a61361e43 100755 --- a/gr-uhd/apps/uhd_rx_cfile.py +++ b/gr-uhd/apps/uhd_rx_cfile.py @@ -39,15 +39,14 @@ class rx_cfile_block(gr.top_block): def __init__(self, options, filename): gr.top_block.__init__(self) - scalar="scalar="+str(options.scalar) # Create a UHD device source if options.output_shorts: self._u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('sc16', - options.wire_format, args=scalar)) + options.wire_format, args=options.stream_args)) self._sink = gr.file_sink(gr.sizeof_short*2, filename) else: self._u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32', - options.wire_format, args=scalar)) + options.wire_format, args=options.stream_args)) self._sink = gr.file_sink(gr.sizeof_gr_complex, filename) # Set the subdevice spec @@ -143,8 +142,8 @@ def get_options(): help="set daughterboard LO offset to OFFSET [default=hw default]") parser.add_option("", "--wire-format", type="string", default="sc16", help="set wire format from USRP [default=%default") - parser.add_option("", "--scalar", type="int", default=1024, - help="set scalar multiplier value for sc8 wire format [default=%default]") + parser.add_option("", "--stream-args", type="string", default="", + help="set stream arguments [default=%default]") parser.add_option("", "--show-async-msg", action="store_true", default=False, help="Show asynchronous message notifications from UHD [default=%default]") diff --git a/gr-uhd/doc/.gitignore b/gr-uhd/doc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-uhd/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-uhd/doc/Makefile.am b/gr-uhd/doc/Makefile.am deleted file mode 100644 index eee3ebcf6..000000000 --- a/gr-uhd/doc/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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 - -SUBDIRS = - -dist_gr_doc_DATA = \ - README.uhd diff --git a/gr-uhd/examples/.gitignore b/gr-uhd/examples/.gitignore deleted file mode 100644 index ad8a13c08..000000000 --- a/gr-uhd/examples/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Makefile -/Makefile.in -*.dat -*.32f -*.32fc diff --git a/gr-uhd/examples/Makefile.am b/gr-uhd/examples/Makefile.am deleted file mode 100644 index a5dc177c4..000000000 --- a/gr-uhd/examples/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# 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 - -SUBDIRS = - -ourdatadir = $(exampledir)/uhd - -dist_ourdata_SCRIPTS = \ - fm_tx4.py \ - fm_tx_2_daughterboards.py \ - max_power.py \ - usrp_am_mw_rcv.py \ - usrp_nbfm_ptt.py \ - usrp_nbfm_rcv.py \ - usrp_spectrum_sense.py \ - usrp_tv_rcv_nogui.py \ - usrp_tv_rcv.py \ - usrp_wfm_rcv2_nogui.py \ - usrp_wfm_rcv_fmdet.py \ - usrp_wfm_rcv_nogui.py \ - usrp_wfm_rcv_pll.py \ - usrp_wfm_rcv.py \ - usrp_wfm_rcv_sca.py \ - usrp_wxapt_rcv.py diff --git a/gr-uhd/grc/.gitignore b/gr-uhd/grc/.gitignore deleted file mode 100644 index 797c54ae7..000000000 --- a/gr-uhd/grc/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/uhd_usrp*.xml -/Makefile -/Makefile.in diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am deleted file mode 100644 index 42a35b1c1..000000000 --- a/gr-uhd/grc/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2010-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 - -grcblocksdir = $(grc_blocksdir) - -generated_uhd_usrp_blocks = \ - uhd_usrp_source.xml \ - uhd_usrp_sink.xml - -BUILT_SOURCES += $(generated_uhd_usrp_blocks) - -dist_grcblocks_DATA = \ - uhd_block_tree.xml \ - uhd_amsg_source.xml \ - $(BUILT_SOURCES) - -######################################################################## -# Rules for generating the source and sink xml wrappers -######################################################################## -EXTRA_DIST += $(srcdir)/gen_uhd_usrp_blocks.py - -$(generated_uhd_usrp_blocks): $(srcdir)/gen_uhd_usrp_blocks.py - @echo "generating $@..." - $(PYTHON) $< $@ diff --git a/gr-uhd/include/.gitignore b/gr-uhd/include/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-uhd/include/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-uhd/include/Makefile.am b/gr-uhd/include/Makefile.am deleted file mode 100644 index 70b80681b..000000000 --- a/gr-uhd/include/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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 - -grinclude_HEADERS = \ - gr_uhd_api.h \ - gr_uhd_usrp_source.h \ - gr_uhd_usrp_sink.h \ - gr_uhd_amsg_source.h diff --git a/gr-uhd/lib/.gitignore b/gr-uhd/lib/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-uhd/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am deleted file mode 100644 index 41ce79d87..000000000 --- a/gr-uhd/lib/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2010-2012 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 - -AM_CPPFLAGS = \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_INCLUDES) \ - $(UHD_CPPFLAGS) \ - -I$(srcdir) \ - -Dgnuradio_uhd_EXPORTS - -lib_LTLIBRARIES = libgnuradio-uhd.la - -libgnuradio_uhd_la_SOURCES = \ - gr_uhd_usrp_source.cc \ - gr_uhd_usrp_sink.cc \ - gr_uhd_amsg_source.cc - -libgnuradio_uhd_la_LIBADD = \ - $(GNURADIO_CORE_LA) \ - $(UHD_LIBS) - -libgnuradio_uhd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) - -noinst_HEADERS = gr_uhd_common.h diff --git a/gr-uhd/swig/.gitignore b/gr-uhd/swig/.gitignore deleted file mode 100644 index 8afaca254..000000000 --- a/gr-uhd/swig/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/uhd_swig.cc -/uhd_swig.py -/Makefile -/Makefile.in -/guile -/python -/run_guile_tests -/run_tests diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am deleted file mode 100644 index dbecd8573..000000000 --- a/gr-uhd/swig/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright 2010-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 -include $(top_srcdir)/Makefile.swig - -TESTS = -EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) -DISTCLEANFILES += run_tests run_guile_tests - -noinst_PYTHON = qa_uhd.py -noinst_GUILE = uhd.test - -AM_CPPFLAGS = \ - $(STD_DEFINES_AND_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ - $(UHD_CPPFLAGS) \ - $(WITH_INCLUDES) - -uhd_swig_swig_args = $(UHD_CPPFLAGS) - -if GUILE -nobase_guile_DATA = \ - gnuradio/uhd.scm -endif - -# ---------------------------------------------------------------- -# The SWIG library - -TOP_SWIG_DOC_IFILES = \ - uhd_swig_doc.i - -TOP_SWIG_IFILES = \ - $(TOP_SWIG_DOC_IFILES) \ - uhd_swig.i - -BUILT_SOURCES += \ - $(TOP_SWIG_DOC_IFILES) - -EXTRA_DIST += \ - $(TOP_SWIG_DOC_IFILES) - -$(TOP_SWIG_DOC_IFILES): - `echo "" > $@` - -# Install so that they end up available as: -# import gnuradio.uhd -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio/uhd -uhd_swig_pythondir_category = \ - gnuradio/uhd - -# additional libraries for linking with the SWIG-generated library -uhd_swig_la_swig_libadd = \ - $(top_builddir)/gr-uhd/lib/libgnuradio-uhd.la - -# additional Python files to be installed along with the SWIG-generated one -uhd_swig_python = \ - __init__.py - -# additional SWIG files to be installed -uhd_swig_swiginclude_headers = \ - $(TOP_SWIG_DOC_IFILES) - -uhd_swig_swig_args = $(UHD_CPPFLAGS) - -## If UHD was installed, defined GR_HAVE_UHD for swigging headers -if GR_DEFINE_HAVE_UHD - uhd_swig_swig_args += -DGR_HAVE_UHD -endif - -if PYTHON -TESTS += run_tests -endif - -if GUILE -TESTS += run_guile_tests -endif diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen deleted file mode 100644 index 62adf8958..000000000 --- a/gr-uhd/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +0,0 @@ -# -*- Makefile -*- -# -# Copyright 2009 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. -# - -# Makefile.swig.gen for uhd_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/uhd_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/uhd_swig -## -## The following can be overloaded to change the install location, but -## this has to be done in the including Makefile.am -before- -## Makefile.swig is included. - -uhd_swig_pythondir_category ?= gnuradio/uhd_swig -uhd_swig_pylibdir_category ?= $(uhd_swig_pythondir_category) -uhd_swig_pythondir = $(pythondir)/$(uhd_swig_pythondir_category) -uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_pylibdir_category) - -# The .so libraries for the guile modules get installed whereever guile -# is installed, usually /usr/lib/guile/gnuradio/ -# FIXME: determince whether these should be installed with gnuradio. -uhd_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/uhd_swig -# FIXME: determince whether these should be installed with gnuradio. -uhd_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -uhd_swig_swigincludedir = $(swigincludedir) - -## This is a template file for a "generated" Makefile addition (in -## this case, "Makefile.swig.gen"). By including the top-level -## Makefile.swig, this file will be used to generate the SWIG -## dependencies. Assign the variable TOP_SWIG_FILES to be the list of -## SWIG .i files to generated wrappings for; there can be more than 1 -## so long as the names are unique (no sorting is done on the -## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i -## file will generate .cc, .py, and possibly .h files -- meaning that -## all of these files will have the same base name (that provided for -## the SWIG .i file). -## -## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the -## right thing. For more info, see < -## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -uhd_swig_swiginclude_HEADERS = \ - uhd_swig.i \ - $(uhd_swig_swiginclude_headers) - -if PYTHON -uhd_swig_pylib_LTLIBRARIES = \ - _uhd_swig.la - -_uhd_swig_la_SOURCES = \ - python/uhd_swig.cc \ - $(uhd_swig_la_swig_sources) - -uhd_swig_python_PYTHON = \ - uhd_swig.py \ - $(uhd_swig_python) - -_uhd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(uhd_swig_la_swig_libadd) - -_uhd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(uhd_swig_la_swig_ldflags) - -_uhd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(uhd_swig_la_swig_cxxflags) - -python/uhd_swig.cc: uhd_swig.py -uhd_swig.py: uhd_swig.i - -# Include the python dependencies for this file --include python/uhd_swig.d - -endif # end of if python - -if GUILE - -uhd_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-uhd_swig.la -libguile_gnuradio_uhd_swig_la_SOURCES = \ - guile/uhd_swig.cc \ - $(uhd_swig_la_swig_sources) -nobase_uhd_swig_scm_DATA = \ - gnuradio/uhd_swig.scm \ - gnuradio/uhd_swig-primitive.scm -libguile_gnuradio_uhd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(uhd_swig_la_swig_libadd) -libguile_gnuradio_uhd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(uhd_swig_la_swig_ldflags) -libguile_gnuradio_uhd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(uhd_swig_la_swig_cxxflags) - -guile/uhd_swig.cc: gnuradio/uhd_swig.scm -gnuradio/uhd_swig.scm: uhd_swig.i -gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm - -# Include the guile dependencies for this file --include guile/uhd_swig.d - -endif # end of GUILE - - diff --git a/gr-uhd/swig/gnuradio/.gitignore b/gr-uhd/swig/gnuradio/.gitignore deleted file mode 100644 index 820cedd8c..000000000 --- a/gr-uhd/swig/gnuradio/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -uhd_swig-primitive.scm -uhd_swig.scm diff --git a/gr-uhd/swig/run_guile_tests.in b/gr-uhd/swig/run_guile_tests.in deleted file mode 100644 index 5d08b0dd5..000000000 --- a/gr-uhd/swig/run_guile_tests.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -. @top_builddir@/setup_guile_test_env - -# 1st argument is absolute path to hand coded guile source directory -# 2nd argument is absolute path to component C++ shared library build directory -# 3nd argument is absolute path to component SWIG build directory - -add_local_paths \ - @srcdir@ \ - @abs_builddir@ \ - @abs_builddir@ - -@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@ diff --git a/gr-uhd/swig/run_tests.in b/gr-uhd/swig/run_tests.in deleted file mode 100644 index 195e71316..000000000 --- a/gr-uhd/swig/run_tests.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# 1st parameter is absolute path to component source directory -# 2nd parameter is absolute path to component build directory -# 3rd parameter is path to Python QA directory - -@top_builddir@/run_tests.sh \ - @abs_top_srcdir@/gr-uhd \ - @abs_top_builddir@/gr-uhd \ - @srcdir@ diff --git a/gr-uhd/swig/uhd.test b/gr-uhd/swig/uhd.test deleted file mode 100644 index adc51c884..000000000 --- a/gr-uhd/swig/uhd.test +++ /dev/null @@ -1,37 +0,0 @@ -;;; -*- Scheme -*- -;;; -;;; Copyright 2010 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 this program. If not, see <http://www.gnu.org/licenses/>. -;;; - -;;; If you're using Emacs's Scheme mode: -;;; (put 'with-test-prefix 'scheme-indent-function 1) - -;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests. -;;; See also the very end of the file, where the test-equal, test-eqv -;;; and test-eq macros are defined. - -(define-module (test-module) - #:use-module (oop goops) - #:use-module (gnuradio core) - #:use-module (gnuradio test-suite lib) - #:duplicates (merge-generics replace check)) - -;;; Just see if we can import the module... -;;; They may not have a UHD device attached, powered up etc. - -(use-modules (gnuradio uhd)) diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 729719dcb..cb74b3dce 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -133,14 +133,4 @@ std::string get_version_string(void){ %} std::string get_version_string(void); -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-uhd_swig" "scm_init_gnuradio_uhd_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif /* SWIGGUILE */ - #endif /* GR_HAVE_UHD */ |