9 files changed, 166 insertions, 176 deletions
diff --git a/gr-usrp/src/.gitignore b/gr-usrp/src/.gitignore
index 68abaf8aa..96caf587f 100644
--- a/gr-usrp/src/.gitignore
+++ b/gr-usrp/src/.gitignore
@@ -6,6 +6,11 @@
 /*.lo
 /usrp_swig.cc
 /usrp_swig.py
+/usrp_swig.scm
 /run_tests
+/run_guile_tests
 /usrp_dbids.py
 /*.pyc
+/gnuradio
+/guile
+/python
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index db5be4ade..29cedc96a 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -20,15 +20,19 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
-# ----------------------------------------------------------------
-# Misc. build/installation activities
-
-EXTRA_DIST = run_tests.in
 
-DISTCLEANFILES = run_tests
+TESTS =
+EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
+DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON =	qa_usrp.py
+noinst_GUILE  = usrp.test
+
+if GUILE
+nobase_guile_DATA = gnuradio/usrp.scm
+endif
 
 # ----------------------------------------------------------------
 # The straight C++ library
@@ -67,10 +71,8 @@ grinclude_HEADERS = \
 	usrp_source_c.h \
 	usrp_source_s.h
 
-if PYTHON
 # ----------------------------------------------------------------
 # The SWIG library
-TESTS = run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp_swig.i
@@ -84,6 +86,7 @@ usrp_swig_pythondir_category = 	\
 
 # additional arguments to the SWIG command
 usrp_swig_swig_args =		\
+	$(DEFAULT_INCLUDES)	\
 	$(USRP_INCLUDES)
 
 # additional libraries for linking with the SWIG-generated library
@@ -105,11 +108,12 @@ usrp_swig_swiginclude_headers =	\
 	usrp_sink_s.i		\
 	usrp_standard.i
 
-include $(top_srcdir)/Makefile.swig
 
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
+if PYTHON
+TESTS += run_tests
+endif
 
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
+if GUILE
+TESTS += run_guile_tests
 endif
+
diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 9884b3d4f..c122d6dd9 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category)
 usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category)
 usrp_swig_pylibdir = $(pyexecdir)/$(usrp_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.
+usrp_swig_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/usrp_swig
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_swig_scmdir = $(guiledir)
+
 ## SWIG headers are always installed into the same directory.
 
 usrp_swig_swigincludedir = $(swigincludedir)
@@ -57,23 +67,10 @@ usrp_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)/usrp_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 += usrp_swig.py usrp_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 @@ usrp_swig_swiginclude_HEADERS =		\
 	usrp_swig.i			\
 	$(usrp_swig_swiginclude_headers)
 
+if PYTHON
 usrp_swig_pylib_LTLIBRARIES =		\
 	_usrp_swig.la
 
 _usrp_swig_la_SOURCES = 			\
-	usrp_swig.cc			\
+	python/usrp_swig.cc		\
 	$(usrp_swig_la_swig_sources)
 
+usrp_swig_python_PYTHON =			\
+	usrp_swig.py			\
+	$(usrp_swig_python)
+
 _usrp_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
@@ -99,161 +101,45 @@ _usrp_swig_la_LDFLAGS =			\
 
 _usrp_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(usrp_swig_la_swig_cxxflags)
 
-usrp_swig_python_PYTHON =			\
-	usrp_swig.py			\
-	$(usrp_swig_python)
+python/usrp_swig.cc: usrp_swig.py
+usrp_swig.py: usrp_swig.i
 
-## Entry rule for running SWIG
+# Include the python dependencies for this file
+-include python/usrp_swig.d
 
-usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_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)/usrp_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)/usrp_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)/usrp_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)/usrp_swig-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_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)/usrp_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)/usrp_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)/usrp_swig-generate-stamp; \
-		exit $$?; \
-	fi;
+endif		# end of if python
 
-$(DEPDIR)/usrp_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) $(usrp_swig_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_swig.Std \
-		-module usrp_swig -o usrp_swig.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
-			> $(DEPDIR)/usrp_swig.Sd; \
-		$(RM) $(DEPDIR)/usrp_swig.Std; \
-		$(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_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)/usrp_swig.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/usrp_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)/usrp_swig.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/usrp_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)/usrp_swig-generate-stamp
+if GUILE
+
+usrp_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-usrp_swig.la
+libguile_gnuradio_usrp_swig_la_SOURCES =	\
+	guile/usrp_swig.cc			\
+	$(usrp_swig_la_swig_sources)
+nobase_usrp_swig_scm_DATA = 		\
+	gnuradio/usrp_swig.scm 		\
+	gnuradio/usrp_swig-primitive.scm
+libguile_gnuradio_usrp_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(usrp_swig_la_swig_libadd)
+libguile_gnuradio_usrp_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(usrp_swig_la_swig_ldflags)
+libguile_gnuradio_usrp_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(usrp_swig_la_swig_cxxflags)
+
+guile/usrp_swig.cc: gnuradio/usrp_swig.scm
+gnuradio/usrp_swig.scm: usrp_swig.i
+gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm
+
+# Include the guile dependencies for this file
+-include guile/usrp_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)/usrp_swig.d@am__quote@
 
diff --git a/gr-usrp/src/gnuradio/.gitignore b/gr-usrp/src/gnuradio/.gitignore
new file mode 100644
index 000000000..0c4d489ab
--- /dev/null
+++ b/gr-usrp/src/gnuradio/.gitignore
@@ -0,0 +1,2 @@
+usrp_swig-primitive.scm
+usrp_swig.scm
diff --git a/gr-usrp/src/gnuradio/usrp.scm b/gr-usrp/src/gnuradio/usrp.scm
new file mode 100644
index 000000000..e01c9454a
--- /dev/null
+++ b/gr-usrp/src/gnuradio/usrp.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 re-exports the usrp_swig module
+
+(define-module (gnuradio usrp)
+  #:use-module (gnuradio export-safely)
+  #:use-module (gnuradio usrp_swig)
+  #:duplicates (merge-generics replace check))
+
+(re-export-all '(gnuradio usrp_swig))
diff --git a/gr-usrp/src/run_guile_tests.in b/gr-usrp/src/run_guile_tests.in
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-usrp/src/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/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-usrp/src/usrp.test b/gr-usrp/src/usrp.test
new file mode 100644
index 000000000..740fe3055
--- /dev/null
+++ b/gr-usrp/src/usrp.test
@@ -0,0 +1,37 @@
+;;; -*- 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 USRP attached and powered up
+
+(use-modules (gnuradio usrp))
diff --git a/gr-usrp/src/usrp_base.i b/gr-usrp/src/usrp_base.i
index d0ece1fb2..0fd62911f 100644
--- a/gr-usrp/src/usrp_base.i
+++ b/gr-usrp/src/usrp_base.i
@@ -24,6 +24,7 @@
 #include "usrp_base.h"
 %}
 
+%ignore usrp_base;
 class usrp_base : public gr_sync_block 
 {
 protected:
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 2a47877c3..80d59abc9 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -23,6 +23,7 @@
 %include "gnuradio.i"	// the common stuff
 
 %{
+#include "config.h"    // for NOMINMAX
 #include <vector>
 %}
 
@@ -39,6 +40,7 @@
 %include "usrp_sink_c.i"
 %include "usrp_sink_s.i"
 
+#ifdef SWIGPYTHON
 //---Allow a more Pythonic interface
 %pythoncode %{
 
@@ -141,3 +143,15 @@ usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}
+#endif
+
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif