11 files changed, 159 insertions, 177 deletions
diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am
index 8fb6fbef8..b760e52b4 100644
--- a/gr-noaa/apps/Makefile.am
+++ b/gr-noaa/apps/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,7 +32,7 @@ dist_bin_SCRIPTS = \
 	usrp_rx_hrpt_nogui.py \
 	usrp_rx_lrit.py
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	hrpt_decode.grc \
 	hrpt_demod.grc \
 	file_rx_hrpt.grc \
diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am
index fdc1476cd..ba660a398 100644
--- a/gr-noaa/lib/Makefile.am
+++ b/gr-noaa/lib/Makefile.am
@@ -44,4 +44,4 @@ libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 grinclude_HEADERS = \
 	noaa_hrpt_decoder.h \
 	noaa_hrpt_deframer.h \
-	noaa_hrpt_pll_cf.h
-\ No newline at end of file
+	noaa_hrpt_pll_cf.h
diff --git a/gr-noaa/oct/Makefile.am b/gr-noaa/oct/Makefile.am
index 2f6e4e575..68a0d1aed 100644
--- a/gr-noaa/oct/Makefile.am
+++ b/gr-noaa/oct/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,6 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	frames_to_ppm.m \
 	frames-to-png.sh
diff --git a/gr-noaa/swig/.gitignore b/gr-noaa/swig/.gitignore
index d18a966df..7dc6d984b 100644
--- a/gr-noaa/swig/.gitignore
+++ b/gr-noaa/swig/.gitignore
@@ -4,3 +4,6 @@ Makefile.in
 .libs
 noaa_swig.cc
 noaa_swig.py
+/run_guile_tests
+/guile
+/python
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 410b23fe6..629c67e99 100644
--- a/gr-noaa/swig/Makefile.am
+++ b/gr-noaa/swig/Makefile.am
@@ -20,6 +20,17 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+noinst_GUILE = noaa.test
+
+if GUILE
+nobase_guile_DATA = gnuradio/noaa.scm
+endif
+
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gr-noaa/lib \
@@ -27,7 +38,6 @@ AM_CPPFLAGS = \
 	$(PYTHON_CPPFLAGS) \
 	$(WITH_INCLUDES)
 
-if PYTHON
 # ----------------------------------------------------------------
 # The SWIG library
 # TESTS = run_tests
@@ -56,11 +66,6 @@ noaa_swig_swiginclude_headers =	\
 	noaa_hrpt_deframer.i \
 	noaa_hrpt_pll_cf.i
 
-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)
+if GUILE
+TESTS += run_guile_tests
 endif
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index 3d7102fe3..f5e778811 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ noaa_swig_pylibdir_category ?= $(noaa_swig_pythondir_category)
 noaa_swig_pythondir = $(pythondir)/$(noaa_swig_pythondir_category)
 noaa_swig_pylibdir = $(pyexecdir)/$(noaa_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.
+noaa_swig_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/noaa_swig
+# FIXME: determince whether these should be installed with gnuradio.
+noaa_swig_scmdir = $(guiledir)
+
 ## SWIG headers are always installed into the same directory.
 
 noaa_swig_swigincludedir = $(swigincludedir)
@@ -57,23 +67,10 @@ noaa_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)/noaa_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 += noaa_swig.py noaa_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 @@ noaa_swig_swiginclude_HEADERS =		\
 	noaa_swig.i			\
 	$(noaa_swig_swiginclude_headers)
 
+if PYTHON
 noaa_swig_pylib_LTLIBRARIES =		\
 	_noaa_swig.la
 
 _noaa_swig_la_SOURCES = 			\
-	noaa_swig.cc			\
+	python/noaa_swig.cc		\
 	$(noaa_swig_la_swig_sources)
 
+noaa_swig_python_PYTHON =			\
+	noaa_swig.py			\
+	$(noaa_swig_python)
+
 _noaa_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(noaa_swig_la_swig_libadd)
@@ -99,161 +101,45 @@ _noaa_swig_la_LDFLAGS =			\
 
 _noaa_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(noaa_swig_la_swig_cxxflags)
 
-noaa_swig_python_PYTHON =			\
-	noaa_swig.py			\
-	$(noaa_swig_python)
+python/noaa_swig.cc: noaa_swig.py
+noaa_swig.py: noaa_swig.i
 
-## Entry rule for running SWIG
+# Include the python dependencies for this file
+-include python/noaa_swig.d
 
-noaa_swig.h noaa_swig.py noaa_swig.cc: noaa_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)/noaa_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)/noaa_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)/noaa_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)/noaa_swig-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_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)/noaa_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)/noaa_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)/noaa_swig-generate-stamp; \
-		exit $$?; \
-	fi;
+endif		# end of if python
 
-$(DEPDIR)/noaa_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) $(noaa_swig_swig_args) \
-		-MD -MF $(DEPDIR)/noaa_swig.Std \
-		-module noaa_swig -o noaa_swig.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/noaa_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \
-			> $(DEPDIR)/noaa_swig.Sd; \
-		$(RM) $(DEPDIR)/noaa_swig.Std; \
-		$(MV) $(DEPDIR)/noaa_swig.Sd $(DEPDIR)/noaa_swig.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/noaa_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)/noaa_swig.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/noaa_swig.Std $(DEPDIR)/noaa_swig.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/noaa_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)/noaa_swig.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/noaa_swig.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/noaa_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)/noaa_swig-generate-stamp
+if GUILE
+
+noaa_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-noaa_swig.la
+libguile_gnuradio_noaa_swig_la_SOURCES =	\
+	guile/noaa_swig.cc			\
+	$(noaa_swig_la_swig_sources)
+nobase_noaa_swig_scm_DATA = 		\
+	gnuradio/noaa_swig.scm 		\
+	gnuradio/noaa_swig-primitive.scm
+libguile_gnuradio_noaa_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(noaa_swig_la_swig_libadd)
+libguile_gnuradio_noaa_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(noaa_swig_la_swig_ldflags)
+libguile_gnuradio_noaa_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(noaa_swig_la_swig_cxxflags)
+
+guile/noaa_swig.cc: gnuradio/noaa_swig.scm
+gnuradio/noaa_swig.scm: noaa_swig.i
+gnuradio/noaa_swig-primitive.scm: gnuradio/noaa_swig.scm
+
+# Include the guile dependencies for this file
+-include guile/noaa_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)/noaa_swig.d@am__quote@
 
diff --git a/gr-noaa/swig/gnuradio/.gitignore b/gr-noaa/swig/gnuradio/.gitignore
new file mode 100644
index 000000000..0c49489de
--- /dev/null
+++ b/gr-noaa/swig/gnuradio/.gitignore
@@ -0,0 +1,2 @@
+/noaa_swig-primitive.scm
+/noaa_swig.scm
diff --git a/gr-noaa/swig/gnuradio/noaa.scm b/gr-noaa/swig/gnuradio/noaa.scm
new file mode 100644
index 000000000..0bb4725ce
--- /dev/null
+++ b/gr-noaa/swig/gnuradio/noaa.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/>.
+;;;
+
+;;; Module that just re-exports the noaa_swig module
+
+(define-module (gnuradio noaa)
+  #:use-module (gnuradio export-safely)
+  #:use-module (gnuradio noaa_swig)
+  #:duplicates (merge-generics replace check))
+
+(re-export-all '(gnuradio noaa_swig))
diff --git a/gr-noaa/swig/noaa.test b/gr-noaa/swig/noaa.test
new file mode 100644
index 000000000..9a0862fdf
--- /dev/null
+++ b/gr-noaa/swig/noaa.test
@@ -0,0 +1,36 @@
+;;; -*- 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))
+
+;;; Confirm we can import the module...
+(use-modules (gnuradio noaa))
+
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index 8fe814a67..3b6e92149 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -32,3 +32,12 @@
 %include "noaa_hrpt_deframer.i"
 %include "noaa_hrpt_pll_cf.i"
 
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-noaa_swig" "scm_init_gnuradio_noaa_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
diff --git a/gr-noaa/swig/run_guile_tests.in b/gr-noaa/swig/run_guile_tests.in
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-noaa/swig/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@