diff options
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/grc/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-uhd/swig/.gitignore | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.am | 20 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.swig.gen | 214 | ||||
| -rw-r--r-- | gr-uhd/swig/gnuradio/.gitignore | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/gnuradio/uhd.scm | 27 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 12 |
7 files changed, 104 insertions, 177 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index 1106bdd23..30061a7ec 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -31,7 +31,7 @@ generated_uhd_single_usrp_blocks = \ uhd_single_usrp_source.xml \ uhd_single_usrp_sink.xml -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(generated_uhd_multi_usrp_blocks) \ $(generated_uhd_single_usrp_blocks) @@ -42,7 +42,7 @@ dist_grcblocks_DATA = \ ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## -EXTRA_DIST = \ +EXTRA_DIST += \ $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \ $(srcdir)/gen_uhd_single_usrp_blocks_xml.py diff --git a/gr-uhd/swig/.gitignore b/gr-uhd/swig/.gitignore index 02d25cc00..8a421846d 100644 --- a/gr-uhd/swig/.gitignore +++ b/gr-uhd/swig/.gitignore @@ -2,3 +2,5 @@ /uhd_swig.py /Makefile /Makefile.in +/guile +/python diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am index b201f676b..3b7b3cc60 100644 --- a/gr-uhd/swig/Makefile.am +++ b/gr-uhd/swig/Makefile.am @@ -20,6 +20,9 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +EXTRA_DIST += $(nobase_guile_DATA) AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ @@ -29,7 +32,11 @@ AM_CPPFLAGS = \ uhd_swig_swig_args = $(UHD_CPPFLAGS) -if PYTHON +if GUILE +nobase_guile_DATA = \ + gnuradio/uhd.scm +endif + # ---------------------------------------------------------------- # The SWIG library # TESTS = run_tests @@ -55,11 +62,6 @@ uhd_swig_python = \ # additional SWIG files to be installed uhd_swig_swiginclude_headers = -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif +uhd_swig_swig_args = \ + $(UHD_CFLAGS) \ + -I$(top_srcdir)/gr-uhd/lib diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen index 3804461a4..b73ccd3c4 100644 --- a/gr-uhd/swig/Makefile.swig.gen +++ b/gr-uhd/swig/Makefile.swig.gen @@ -38,6 +38,16 @@ 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) @@ -57,23 +67,10 @@ uhd_swig_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/uhd_swig-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -swig_built_sources += uhd_swig.py uhd_swig.cc - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -82,13 +79,18 @@ uhd_swig_swiginclude_HEADERS = \ uhd_swig.i \ $(uhd_swig_swiginclude_headers) +if PYTHON uhd_swig_pylib_LTLIBRARIES = \ _uhd_swig.la _uhd_swig_la_SOURCES = \ - uhd_swig.cc \ + 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) @@ -99,161 +101,45 @@ _uhd_swig_la_LDFLAGS = \ _uhd_swig_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(uhd_swig_la_swig_cxxflags) -uhd_swig_python_PYTHON = \ - uhd_swig.py \ - $(uhd_swig_python) +python/uhd_swig.cc: uhd_swig.py +uhd_swig.py: uhd_swig.i -## Entry rule for running SWIG +# Include the python dependencies for this file +-include python/uhd_swig.d -uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/uhd_swig-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/uhd_swig-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/uhd_swig-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/uhd_swig-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-stamp WHAT=$<; \ -## -## Now that the .cc, .h, and .py files have been (re)created from the -## .i file, future checking of this rule during the same MAKE -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/uhd_swig-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/uhd_swig-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/uhd_swig-generate-stamp; \ - exit $$?; \ - fi; +endif # end of if python -$(DEPDIR)/uhd_swig-generate-stamp: -## This rule will be called only by the first process issuing the -## above rule to succeed in creating the lock directory, after -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(uhd_swig_swig_args) \ - -MD -MF $(DEPDIR)/uhd_swig.Std \ - -module uhd_swig -o uhd_swig.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/uhd_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \ - > $(DEPDIR)/uhd_swig.Sd; \ - $(RM) $(DEPDIR)/uhd_swig.Std; \ - $(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/uhd_swig.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/uhd_swig.Std $(DEPDIR)/uhd_swig.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/uhd_swig.d -## -## (4) from the SWIG file, remove the first line (the target); remove -## trailing " \" and " " from each line. Append ":" to each line, -## followed by 2 carriage returns, then append this to the end of -## the dependency file. -## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/uhd_swig.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/uhd_swig-generate-stamp +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 -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# not guaranteed to be portable, but will probably work. If it works, -# we have accurate dependencies for our swig stuff, which is good. +endif # end of GUILE -@am__include@ @am__quote@./$(DEPDIR)/uhd_swig.d@am__quote@ diff --git a/gr-uhd/swig/gnuradio/.gitignore b/gr-uhd/swig/gnuradio/.gitignore new file mode 100644 index 000000000..820cedd8c --- /dev/null +++ b/gr-uhd/swig/gnuradio/.gitignore @@ -0,0 +1,2 @@ +uhd_swig-primitive.scm +uhd_swig.scm diff --git a/gr-uhd/swig/gnuradio/uhd.scm b/gr-uhd/swig/gnuradio/uhd.scm new file mode 100644 index 000000000..906aef2a6 --- /dev/null +++ b/gr-uhd/swig/gnuradio/uhd.scm @@ -0,0 +1,27 @@ +;;; +;;; 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/>. +;;; + +;;; Semi bogus module that just reexports the uhd_swig module + +(define-module (gnuradio uhd) + #:use-module (gnuradio export-safely) + #:use-module (gnuradio uhd_swig) + #:duplicates (merge-generics replace check)) + +(re-export-all '(gnuradio uhd_swig)) diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 695cf1cd2..079f8120e 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -42,8 +42,6 @@ // standard includes //////////////////////////////////////////////////////////////////////// %include "gnuradio.i" -%include "std_string.i" -%include "std_vector.i" namespace std { %template(StringVector) vector<string>; @@ -104,3 +102,13 @@ GR_SWIG_BLOCK_MAGIC(uhd,single_usrp_sink) static const size_t ALL_MBOARDS = uhd::usrp::multi_usrp::ALL_MBOARDS; %} static const size_t ALL_MBOARDS; + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio-uhd_swig" "scm_init_gnuradio_uhd_swig_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif |