Create guile QA framework.

Also moves hand coded files out of gnuradio-core/src/lib/swig/gnuradio
that were getting nuked by make clean.

10 files changed, 58 insertions, 14 deletions

diff --git a/gnuradio-core/src/Makefile.am b/gnuradio-core/src/Makefile.am
index eb979fe58..648fe299e 100644
--- a/gnuradio-core/src/Makefile.am
+++ b/gnuradio-core/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2004,2009 Free Software Foundation, Inc.
+# Copyright 2001,2004,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,5 +25,8 @@ SUBDIRS = gen_interpolator_taps lib tests
 if PYTHON
 SUBDIRS += python
 endif
+if GUILE
+SUBDIRS += guile
+endif
 
-DIST_SUBDIRS = gen_interpolator_taps lib tests python utils
+DIST_SUBDIRS = gen_interpolator_taps lib tests python guile utils
diff --git a/gnuradio-core/src/guile/.gitignore b/gnuradio-core/src/guile/.gitignore
new file mode 100644
index 000000000..6a0410b79
--- /dev/null
+++ b/gnuradio-core/src/guile/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/run_guile_tests
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
new file mode 100644
index 000000000..3c21373af
--- /dev/null
+++ b/gnuradio-core/src/guile/Makefile.am
@@ -0,0 +1,38 @@
+#
+# 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/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+TESTS = run_guile_tests
+
+EXTRA_DIST = run_guile_tests.in
+
+# These are the hand-code guile files for gnuradio-core.
+#
+# Swig/common.scm is glue that's required for the goops wrappers.
+# gnuradio/export-safely.scm works around some problems in the goops generated wrappers.
+# gnuradio/core.scm glues the 5 pieces of gnuradio_core_* into a single module.
+# gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect.
+
+nobase_guile_DATA = \
+	Swig/common.scm \
+	gnuradio/core.scm \
+	gnuradio/export-safely.scm \
+	gnuradio/runtime-shim.scm
+
diff --git a/gnuradio-core/src/lib/swig/Swig/common.scm b/gnuradio-core/src/guile/Swig/common.scm
index a51d3a71d..a51d3a71d 100644
--- a/gnuradio-core/src/lib/swig/Swig/common.scm
+++ b/gnuradio-core/src/guile/Swig/common.scm
diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/guile/gnuradio/core.scm
index f13a8fb60..f13a8fb60 100644
--- a/gnuradio-core/src/lib/swig/gnuradio/core.scm
+++ b/gnuradio-core/src/guile/gnuradio/core.scm
diff --git a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm b/gnuradio-core/src/guile/gnuradio/export-safely.scm
index 664292d2b..664292d2b 100644
--- a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm
+++ b/gnuradio-core/src/guile/gnuradio/export-safely.scm
diff --git a/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm b/gnuradio-core/src/guile/gnuradio/runtime-shim.scm
index c08d3947c..c08d3947c 100644
--- a/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm
+++ b/gnuradio-core/src/guile/gnuradio/runtime-shim.scm
diff --git a/gnuradio-core/src/guile/qa_stub.scm b/gnuradio-core/src/guile/qa_stub.scm
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/gnuradio-core/src/guile/qa_stub.scm
diff --git a/gnuradio-core/src/guile/run_guile_tests.in b/gnuradio-core/src/guile/run_guile_tests.in
new file mode 100644
index 000000000..2ef160397
--- /dev/null
+++ b/gnuradio-core/src/guile/run_guile_tests.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# 1st argument is absolute path to component C++ shared library build directory
+# 2nd argument is absolute path to hand coded guile source directory
+# 3nd argument is absolute path to component SWIG build directory
+# 4rd argument is absolute path to component Guile QA test directory
+
+@top_builddir@/run_guile_tests.sh \
+    "" \
+    "" \
+    "" \
+    @abs_top_srcdir@/gnuradio-core/src/guile
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 54cbebeb1..5e003bdf2 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -56,18 +56,6 @@ nobase_swiginclude_HEADERS = \
 	guile/std_complex.i
 
 
-if GUILE
-# This is the top level guile file, which loads all the other scm files
-# for gnuradio. This has to be installed top level to be found in the
-# default search path.
-nobase_guile_DATA = \
-	gnuradio/core.scm \
-	gnuradio/export-safely.scm \
-	gnuradio/runtime-shim.scm \
-	Swig/common.scm
-endif
-
-
 if PYTHON
 AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	 $(WITH_INCLUDES)