diff options
Diffstat (limited to 'gr-pager')
| -rw-r--r-- | gr-pager/apps/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-pager/lib/Makefile.swig.gen | 259 | ||||
| -rw-r--r-- | gr-pager/python/Makefile.am | 10 | ||||
| -rw-r--r-- | gr-pager/swig/.gitignore | 3 | ||||
| -rw-r--r-- | gr-pager/swig/Makefile.am | 22 | ||||
| -rw-r--r-- | gr-pager/swig/Makefile.swig.gen | 214 | ||||
| -rw-r--r-- | gr-pager/swig/gnuradio/.gitignore | 2 | ||||
| -rw-r--r-- | gr-pager/swig/gnuradio/pager.scm | 28 | ||||
| -rw-r--r-- | gr-pager/swig/pager.test | 36 | ||||
| -rw-r--r-- | gr-pager/swig/pager_swig.i | 10 | ||||
| -rw-r--r-- | gr-pager/swig/run_guile_tests.in | 14 |
11 files changed, 165 insertions, 437 deletions
diff --git a/gr-pager/apps/Makefile.am b/gr-pager/apps/Makefile.am index 7b495fd2b..a320ffefc 100644 --- a/gr-pager/apps/Makefile.am +++ b/gr-pager/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,5 +32,5 @@ noinst_PYTHON = \ usrp_rx_flex.py endif -EXTRA_DIST = \ +EXTRA_DIST += \ usrp_rx_flex.grc diff --git a/gr-pager/lib/Makefile.swig.gen b/gr-pager/lib/Makefile.swig.gen deleted file mode 100644 index 5cfbc66be..000000000 --- a/gr-pager/lib/Makefile.swig.gen +++ /dev/null @@ -1,259 +0,0 @@ -# -*- Makefile -*- -# -# Copyright 2009 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -# Makefile.swig.gen for pager_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/pager_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/pager_swig -## -## The following can be overloaded to change the install location, but -## this has to be done in the including Makefile.am -before- -## Makefile.swig is included. - -pager_swig_pythondir_category ?= gnuradio/pager_swig -pager_swig_pylibdir_category ?= $(pager_swig_pythondir_category) -pager_swig_pythondir = $(pythondir)/$(pager_swig_pythondir_category) -pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_pylibdir_category) - -## SWIG headers are always installed into the same directory. - -pager_swig_swigincludedir = $(swigincludedir) - -## This is a template file for a "generated" Makefile addition (in -## this case, "Makefile.swig.gen"). By including the top-level -## Makefile.swig, this file will be used to generate the SWIG -## dependencies. Assign the variable TOP_SWIG_FILES to be the list of -## SWIG .i files to generated wrappings for; there can be more than 1 -## so long as the names are unique (no sorting is done on the -## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i -## file will generate .cc, .py, and possibly .h files -- meaning that -## all of these files will have the same base name (that provided for -## the SWIG .i file). -## -## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the -## 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)/pager_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 += pager_swig.py pager_swig.cc - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -pager_swig_swiginclude_HEADERS = \ - pager_swig.i \ - $(pager_swig_swiginclude_headers) - -pager_swig_pylib_LTLIBRARIES = \ - _pager_swig.la - -_pager_swig_la_SOURCES = \ - pager_swig.cc \ - $(pager_swig_la_swig_sources) - -_pager_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(pager_swig_la_swig_libadd) - -_pager_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(pager_swig_la_swig_ldflags) - -_pager_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(pager_swig_la_swig_cxxflags) - -pager_swig_python_PYTHON = \ - pager_swig.py \ - $(pager_swig_python) - -## Entry rule for running SWIG - -pager_swig.h pager_swig.py pager_swig.cc: pager_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)/pager_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)/pager_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)/pager_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)/pager_swig-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_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)/pager_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)/pager_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)/pager_swig-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/pager_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) $(pager_swig_swig_args) \ - -MD -MF $(DEPDIR)/pager_swig.Std \ - -module pager_swig -o pager_swig.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/pager_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \ - > $(DEPDIR)/pager_swig.Sd; \ - $(RM) $(DEPDIR)/pager_swig.Std; \ - $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/pager_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)/pager_swig.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/pager_swig.Std $(DEPDIR)/pager_swig.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/pager_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)/pager_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/pager_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)/pager_swig-generate-stamp - -# 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. - -@am__include@ @am__quote@./$(DEPDIR)/pager_swig.d@am__quote@ - diff --git a/gr-pager/python/Makefile.am b/gr-pager/python/Makefile.am index f80375c7c..4502859c3 100644 --- a/gr-pager/python/Makefile.am +++ b/gr-pager/python/Makefile.am @@ -21,7 +21,12 @@ include $(top_srcdir)/Makefile.common +TESTS = +EXTRA_DIST += run_tests.in + if PYTHON +TESTS += run_tests + pagerdir = $(grpythondir)/pager noinst_PYTHON = \ @@ -31,9 +36,4 @@ pager_PYTHON = \ __init__.py \ pager_utils.py \ flex_demod.py - -TESTS = run_tests - -EXTRA_DIST = run_tests.in - endif diff --git a/gr-pager/swig/.gitignore b/gr-pager/swig/.gitignore index 6df28c365..7e864f43f 100644 --- a/gr-pager/swig/.gitignore +++ b/gr-pager/swig/.gitignore @@ -4,3 +4,6 @@ /pager_swig.cc /*.pyc /run_tests +/run_guile_tests +/guile +/python diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am index c59bdb0f2..3d62c80f0 100644 --- a/gr-pager/swig/Makefile.am +++ b/gr-pager/swig/Makefile.am @@ -20,6 +20,10 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +TESTS = +EXTRA_DIST += $(nobase_guile_DATA) AM_CPPFLAGS = \ -I$(top_srcdir)/gr-pager/lib \ @@ -27,6 +31,14 @@ AM_CPPFLAGS = \ $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) +if GUILE +nobase_guile_DATA = \ + gnuradio/pager.scm +endif + +noinst_GUILE = pager.test + + ############################## # SWIG interface and library TOP_SWIG_IFILES = \ @@ -51,10 +63,6 @@ pager_swig_swiginclude_headers = \ pager_flex_sync.i \ pager_slicer_fb.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
\ No newline at end of file diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen index 5cfbc66be..70d215384 100644 --- a/gr-pager/swig/Makefile.swig.gen +++ b/gr-pager/swig/Makefile.swig.gen @@ -38,6 +38,16 @@ pager_swig_pylibdir_category ?= $(pager_swig_pythondir_category) pager_swig_pythondir = $(pythondir)/$(pager_swig_pythondir_category) pager_swig_pylibdir = $(pyexecdir)/$(pager_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. +pager_swig_scmlibdir = $(libdir) + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/pager_swig +# FIXME: determince whether these should be installed with gnuradio. +pager_swig_scmdir = $(guiledir) + ## SWIG headers are always installed into the same directory. pager_swig_swigincludedir = $(swigincludedir) @@ -57,23 +67,10 @@ pager_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)/pager_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 += pager_swig.py pager_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 @@ pager_swig_swiginclude_HEADERS = \ pager_swig.i \ $(pager_swig_swiginclude_headers) +if PYTHON pager_swig_pylib_LTLIBRARIES = \ _pager_swig.la _pager_swig_la_SOURCES = \ - pager_swig.cc \ + python/pager_swig.cc \ $(pager_swig_la_swig_sources) +pager_swig_python_PYTHON = \ + pager_swig.py \ + $(pager_swig_python) + _pager_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(pager_swig_la_swig_libadd) @@ -99,161 +101,45 @@ _pager_swig_la_LDFLAGS = \ _pager_swig_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(pager_swig_la_swig_cxxflags) -pager_swig_python_PYTHON = \ - pager_swig.py \ - $(pager_swig_python) +python/pager_swig.cc: pager_swig.py +pager_swig.py: pager_swig.i -## Entry rule for running SWIG +# Include the python dependencies for this file +-include python/pager_swig.d -pager_swig.h pager_swig.py pager_swig.cc: pager_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)/pager_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)/pager_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)/pager_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)/pager_swig-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_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)/pager_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)/pager_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)/pager_swig-generate-stamp; \ - exit $$?; \ - fi; +endif # end of if python -$(DEPDIR)/pager_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) $(pager_swig_swig_args) \ - -MD -MF $(DEPDIR)/pager_swig.Std \ - -module pager_swig -o pager_swig.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/pager_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \ - > $(DEPDIR)/pager_swig.Sd; \ - $(RM) $(DEPDIR)/pager_swig.Std; \ - $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/pager_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)/pager_swig.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/pager_swig.Std $(DEPDIR)/pager_swig.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/pager_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)/pager_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/pager_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)/pager_swig-generate-stamp +if GUILE + +pager_swig_scmlib_LTLIBRARIES = \ + libguile-gnuradio-pager_swig.la +libguile_gnuradio_pager_swig_la_SOURCES = \ + guile/pager_swig.cc \ + $(pager_swig_la_swig_sources) +nobase_pager_swig_scm_DATA = \ + gnuradio/pager_swig.scm \ + gnuradio/pager_swig-primitive.scm +libguile_gnuradio_pager_swig_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(pager_swig_la_swig_libadd) +libguile_gnuradio_pager_swig_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(pager_swig_la_swig_ldflags) +libguile_gnuradio_pager_swig_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(pager_swig_la_swig_cxxflags) + +guile/pager_swig.cc: gnuradio/pager_swig.scm +gnuradio/pager_swig.scm: pager_swig.i +gnuradio/pager_swig-primitive.scm: gnuradio/pager_swig.scm + +# Include the guile dependencies for this file +-include guile/pager_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)/pager_swig.d@am__quote@ diff --git a/gr-pager/swig/gnuradio/.gitignore b/gr-pager/swig/gnuradio/.gitignore new file mode 100644 index 000000000..15034e70e --- /dev/null +++ b/gr-pager/swig/gnuradio/.gitignore @@ -0,0 +1,2 @@ +pager_swig-primitive.scm +pager_swig.scm diff --git a/gr-pager/swig/gnuradio/pager.scm b/gr-pager/swig/gnuradio/pager.scm new file mode 100644 index 000000000..99331b09c --- /dev/null +++ b/gr-pager/swig/gnuradio/pager.scm @@ -0,0 +1,28 @@ +;;; +;;; 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 pager_swig module + +(define-module (gnuradio pager) + #:use-module (gnuradio export-safely) + #:use-module (gnuradio pager_swig) + #:duplicates (merge-generics replace check)) + +(re-export-all '(gnuradio pager_swig)) + diff --git a/gr-pager/swig/pager.test b/gr-pager/swig/pager.test new file mode 100644 index 000000000..a5deb5810 --- /dev/null +++ b/gr-pager/swig/pager.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 pager)) + diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i index 66d6de7d8..2896fa368 100644 --- a/gr-pager/swig/pager_swig.i +++ b/gr-pager/swig/pager_swig.i @@ -34,3 +34,13 @@ %include "pager_flex_sync.i" %include "pager_flex_deinterleave.i" %include "pager_flex_parse.i" + +#if SWIGGUILE +%scheme %{ +(load-extension-global "libguile-gnuradio-pager_swig" "scm_init_gnuradio_pager_swig_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif diff --git a/gr-pager/swig/run_guile_tests.in b/gr-pager/swig/run_guile_tests.in new file mode 100644 index 000000000..5d08b0dd5 --- /dev/null +++ b/gr-pager/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@ |