diff options
Diffstat (limited to 'gr-trellis/src/lib')
| -rw-r--r-- | gr-trellis/src/lib/.gitignore | 4 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 25 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.swig.gen | 214 | ||||
| -rw-r--r-- | gr-trellis/src/lib/run_guile_tests.in | 14 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis.i | 9 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis.test | 53 |
6 files changed, 144 insertions, 175 deletions
diff --git a/gr-trellis/src/lib/.gitignore b/gr-trellis/src/lib/.gitignore index 8932c3611..5dcb1c2c7 100644 --- a/gr-trellis/src/lib/.gitignore +++ b/gr-trellis/src/lib/.gitignore @@ -97,3 +97,7 @@ /trellis_generated.i /generate-stamp /stamp-* +/run_guile_tests +/gnuradio +/guile +/python diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 3e1803554..08e75291a 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,14 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +TESTS = + +EXTRA_DIST += \ + run_guile_tests.in \ + trellis.test + AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -49,7 +57,7 @@ python_built_sources = \ $(GENERATED_CC) \ trellis_generated.i -EXTRA_DIST = \ +EXTRA_DIST += \ $(core_generator) # These headers get installed in ${prefix}/include/gnuradio @@ -84,8 +92,8 @@ libgnuradio_trellis_la_LIBADD = \ libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) +trellis.py trellis.scm: trellis_generated.i -if PYTHON ################################# # SWIG interface and library @@ -130,13 +138,8 @@ gen_sources_deps = $(core_generator) par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py include $(top_srcdir)/Makefile.par.gen -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = \ - $(python_built_sources) \ - $(swig_built_sources) +BUILT_SOURCES += $(python_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-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen index 1a9656b8f..784c146cf 100644 --- a/gr-trellis/src/lib/Makefile.swig.gen +++ b/gr-trellis/src/lib/Makefile.swig.gen @@ -38,6 +38,16 @@ trellis_pylibdir_category ?= $(trellis_pythondir_category) trellis_pythondir = $(pythondir)/$(trellis_pythondir_category) trellis_pylibdir = $(pyexecdir)/$(trellis_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. +trellis_scmlibdir = $(libdir) + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/trellis +# FIXME: determince whether these should be installed with gnuradio. +trellis_scmdir = $(guiledir) + ## SWIG headers are always installed into the same directory. trellis_swigincludedir = $(swigincludedir) @@ -57,23 +67,10 @@ trellis_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)/trellis-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 += trellis.py trellis.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 @@ trellis_swiginclude_HEADERS = \ trellis.i \ $(trellis_swiginclude_headers) +if PYTHON trellis_pylib_LTLIBRARIES = \ _trellis.la _trellis_la_SOURCES = \ - trellis.cc \ + python/trellis.cc \ $(trellis_la_swig_sources) +trellis_python_PYTHON = \ + trellis.py \ + $(trellis_python) + _trellis_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(trellis_la_swig_libadd) @@ -99,161 +101,45 @@ _trellis_la_LDFLAGS = \ _trellis_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(trellis_la_swig_cxxflags) -trellis_python_PYTHON = \ - trellis.py \ - $(trellis_python) +python/trellis.cc: trellis.py +trellis.py: trellis.i -## Entry rule for running SWIG +# Include the python dependencies for this file +-include python/trellis.d -trellis.h trellis.py trellis.cc: trellis.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)/trellis-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)/trellis-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)/trellis-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)/trellis-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-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)/trellis-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)/trellis-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)/trellis-generate-stamp; \ - exit $$?; \ - fi; +endif # end of if python -$(DEPDIR)/trellis-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) $(trellis_swig_args) \ - -MD -MF $(DEPDIR)/trellis.Std \ - -module trellis -o trellis.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/trellis.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \ - > $(DEPDIR)/trellis.Sd; \ - $(RM) $(DEPDIR)/trellis.Std; \ - $(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/trellis.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)/trellis.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/trellis.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)/trellis.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/trellis.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)/trellis-generate-stamp +if GUILE + +trellis_scmlib_LTLIBRARIES = \ + libguile-gnuradio-trellis.la +libguile_gnuradio_trellis_la_SOURCES = \ + guile/trellis.cc \ + $(trellis_la_swig_sources) +nobase_trellis_scm_DATA = \ + gnuradio/trellis.scm \ + gnuradio/trellis-primitive.scm +libguile_gnuradio_trellis_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(trellis_la_swig_libadd) +libguile_gnuradio_trellis_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(trellis_la_swig_ldflags) +libguile_gnuradio_trellis_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(trellis_la_swig_cxxflags) + +guile/trellis.cc: gnuradio/trellis.scm +gnuradio/trellis.scm: trellis.i +gnuradio/trellis-primitive.scm: gnuradio/trellis.scm + +# Include the guile dependencies for this file +-include guile/trellis.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)/trellis.d@am__quote@ diff --git a/gr-trellis/src/lib/run_guile_tests.in b/gr-trellis/src/lib/run_guile_tests.in new file mode 100644 index 000000000..5d08b0dd5 --- /dev/null +++ b/gr-trellis/src/lib/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-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i index ed1fe29ca..d035cea54 100644 --- a/gr-trellis/src/lib/trellis.i +++ b/gr-trellis/src/lib/trellis.i @@ -44,3 +44,12 @@ %include "trellis_generated.i" +#if SWIGGUILE +%scheme %{ +(load-extension-global "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif diff --git a/gr-trellis/src/lib/trellis.test b/gr-trellis/src/lib/trellis.test new file mode 100644 index 000000000..d370ab18c --- /dev/null +++ b/gr-trellis/src/lib/trellis.test @@ -0,0 +1,53 @@ +;;; -*- 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)) + + +;;; See if we can import the module... +(use-modules (gnuradio trellis)) + +;;; Now do some real testing, like that in ../python/qa_trellis.py +;;; FIXME later. Other problems to deal with. Looks like +;;; I don't understand the constructor to <fsm> + +(read-set! keywords 'prefix) + +'(with-test-prefix "test-001-fsm" + (let* ((I 2) + (S 4) + (O 4) + (NS #(0 2 0 2 1 3 1 3)) + (OS #(0 3 3 0 1 2 2 1)) + (f (make <fsm> :I I :S S :O O :NS NS :OS OS))) + (test-equal (list I S O NS OS) + (list (gr:I f) (gr:S f) (gr:O f) (gr:NS f) (gr:OS f))))) + |