From 2bf64459036916258dcf3269cec47904fdeba8f6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 1 Apr 2012 16:13:42 -0400 Subject: Removes all references to guile and scheme, which are no longer needed. The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point. --- README | 25 ++-- gnuradio-core/gnuradio-core.pc.in | 1 - gnuradio-core/src/lib/io/gr_message_source.i | 8 -- gnuradio-core/src/lib/runtime/gr_basic_block.h | 2 +- gnuradio-core/src/lib/runtime/gr_hier_block2.h | 2 +- gnuradio-core/src/lib/runtime/gr_hier_block2.i | 2 +- gnuradio-core/src/lib/runtime/gr_msg_queue.i | 61 --------- gnuradio-core/src/lib/runtime/gr_top_block.h | 2 +- gnuradio-core/src/lib/runtime/gr_top_block.i | 33 +---- gnuradio-core/src/lib/swig/gnuradio.i | 19 --- gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 10 -- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 10 -- gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 10 -- gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 10 -- gnuradio-core/src/lib/swig/gnuradio_core_io.i | 10 -- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 25 ---- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 18 --- gnuradio-pkg_chk.conf | 70 ---------- gr-comedi/src/comedi.i | 10 -- gr-digital/swig/Makefile.swig.gen | 142 -------------------- gr-digital/swig/digital_swig.i | 18 --- gr-fcd/swig/Makefile.swig.gen | 145 --------------------- gr-fcd/swig/fcd_swig.i | 10 -- gr-fcd/swig/run_guile_tests.in | 14 -- gr-howto-write-a-block/swig/howto_swig.i | 10 -- gr-noaa/swig/Makefile.swig.gen | 145 --------------------- gr-noaa/swig/noaa.test | 36 ----- gr-noaa/swig/noaa_swig.i | 10 -- gr-pager/swig/Makefile.swig.gen | 145 --------------------- gr-pager/swig/pager.test | 36 ----- gr-pager/swig/pager_swig.i | 10 -- gr-qtgui/swig/Makefile.swig.gen | 145 --------------------- gr-shd/swig/Makefile.swig.gen | 145 --------------------- gr-shd/swig/shd.test | 37 ------ gr-shd/swig/shd_swig.i | 10 -- gr-trellis/src/lib/Makefile.swig.gen | 145 --------------------- gr-trellis/src/lib/trellis.i | 10 -- gr-trellis/src/lib/trellis.test | 53 -------- gr-uhd/swig/Makefile.swig.gen | 145 --------------------- gr-uhd/swig/uhd.test | 37 ------ gr-uhd/swig/uhd_swig.i | 10 -- gr-video-sdl/src/Makefile.swig.gen | 145 --------------------- gr-video-sdl/src/video_sdl.i | 10 -- gr-vocoder/swig/Makefile.swig.gen | 145 --------------------- gr-vocoder/swig/vocoder_swig.i | 10 -- gruel/CMakeLists.txt | 1 - gruel/src/lib/pmt/CMakeLists.txt | 11 +- gruel/src/lib/pmt/gen-serial-tags.py | 53 ++++++++ gruel/src/lib/pmt/pmt-serial-tags.scm | 75 +++++++++++ gruel/src/scheme/gnuradio/CMakeLists.txt | 26 ---- gruel/src/scheme/gnuradio/gen-serial-tags.py | 53 -------- gruel/src/scheme/gnuradio/macros-etc.scm | 50 ------- gruel/src/scheme/gnuradio/pmt-serial-tags.scm | 75 ----------- gruel/src/scheme/gnuradio/pmt-serialize.scm | 48 ------- gruel/src/swig/Makefile.swig.gen | 145 --------------------- 55 files changed, 147 insertions(+), 2486 deletions(-) delete mode 100644 gnuradio-pkg_chk.conf delete mode 100644 gr-digital/swig/Makefile.swig.gen delete mode 100644 gr-fcd/swig/Makefile.swig.gen delete mode 100644 gr-fcd/swig/run_guile_tests.in delete mode 100644 gr-noaa/swig/Makefile.swig.gen delete mode 100644 gr-noaa/swig/noaa.test delete mode 100644 gr-pager/swig/Makefile.swig.gen delete mode 100644 gr-pager/swig/pager.test delete mode 100644 gr-qtgui/swig/Makefile.swig.gen delete mode 100644 gr-shd/swig/Makefile.swig.gen delete mode 100644 gr-shd/swig/shd.test delete mode 100644 gr-trellis/src/lib/Makefile.swig.gen delete mode 100644 gr-trellis/src/lib/trellis.test delete mode 100644 gr-uhd/swig/Makefile.swig.gen delete mode 100644 gr-uhd/swig/uhd.test delete mode 100644 gr-video-sdl/src/Makefile.swig.gen delete mode 100644 gr-vocoder/swig/Makefile.swig.gen create mode 100644 gruel/src/lib/pmt/gen-serial-tags.py create mode 100644 gruel/src/lib/pmt/pmt-serial-tags.scm delete mode 100644 gruel/src/scheme/gnuradio/CMakeLists.txt delete mode 100644 gruel/src/scheme/gnuradio/gen-serial-tags.py delete mode 100644 gruel/src/scheme/gnuradio/macros-etc.scm delete mode 100644 gruel/src/scheme/gnuradio/pmt-serial-tags.scm delete mode 100644 gruel/src/scheme/gnuradio/pmt-serialize.scm delete mode 100644 gruel/src/swig/Makefile.swig.gen diff --git a/README b/README index 9f56e7f18..63d093a5e 100644 --- a/README +++ b/README @@ -193,42 +193,37 @@ Unit testing framework for C++. As of repository version 4045, gnuradio requires version 1.3.31 or newer. -(9) Guile 1.6 or 1.8 - -Scheme interpreter. http://www.gnu.org/software/guile/guile.html - - -(10) GNU Scientific Library (gsl) 1.10 or later +(9) GNU Scientific Library (gsl) 1.10 or later The GNU Radio core library uses some routines from here. Optional, but nice to have: -(11) wxPython. Python binding for the wxWidgets GUI framework. Use +(10) wxPython. Python binding for the wxWidgets GUI framework. Use version 2.8 or later. Again, almost all systems have this available. As a last resort, build it from source (not recommended!) http://www.wxpython.org -(12) xmlto version ? or later. http://cyberelk.net/tim/xmlto/index.html +(11) xmlto version ? or later. http://cyberelk.net/tim/xmlto/index.html Wrapper for XML conversion tools to ease e.g. making html from docbook. -(13) Python Cheetah extensions 2.0.0 or later -(14) Python lxml wrappers 2.0.0 or later -(15) Python gtk wrappers 2.10.0 or later +(12) Python Cheetah extensions 2.0.0 or later +(13) Python lxml wrappers 2.0.0 or later +(14) Python gtk wrappers 2.10.0 or later The GNU Radio Companion application requires these additional Python libraries to be installed. The gr-qtgui requires these packages: -(16) Qt 4.4 or later -(17) Qwt 5.2 or later -(18) PyQt 4.4 or later -(19) PyQwt 5.2 or later +(15) Qt 4.4 or later +(16) Qwt 5.2 or later +(17) PyQt 4.4 or later +(18) PyQwt 5.2 or later It is also useful to have Python's Scipy and Matplot lib packages to run some of the example. diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in index 40c26a129..5d743a4e9 100644 --- a/gnuradio-core/gnuradio-core.pc.in +++ b/gnuradio-core/gnuradio-core.pc.in @@ -2,7 +2,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/gnuradio -guile_load_path=@prefix@/share/guile/site Name: gnuradio-core Description: GNU Software Radio toolkit diff --git a/gnuradio-core/src/lib/io/gr_message_source.i b/gnuradio-core/src/lib/io/gr_message_source.i index e4e2016d0..8a9c762d0 100644 --- a/gnuradio-core/src/lib/io/gr_message_source.i +++ b/gnuradio-core/src/lib/io/gr_message_source.i @@ -22,14 +22,6 @@ GR_SWIG_BLOCK_MAGIC(gr,message_source); -#ifdef SWIGGUILE -// Rename these. Without this, the primitive bindings are OK, but the -// goops bindings try to create a bogus generic-function... -// See core.scm for the second part of the workaround. -%rename(message_source_limit_ctor) gr_make_message_source(size_t itemsize, int msgq_limit); -%rename(message_source_msgq_ctor) gr_make_message_source(size_t itemsize, gr_msg_queue_sptr msgq); -#endif - gr_message_source_sptr gr_make_message_source (size_t itemsize, int msgq_limit=0); gr_message_source_sptr gr_make_message_source (size_t itemsize, gr_msg_queue_sptr msgq); diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h index 2adca8ccb..7e95509e2 100644 --- a/gnuradio-core/src/lib/runtime/gr_basic_block.h +++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h @@ -103,7 +103,7 @@ public: std::string name() const { return d_name; } gr_io_signature_sptr input_signature() const { return d_input_signature; } gr_io_signature_sptr output_signature() const { return d_output_signature; } - gr_basic_block_sptr to_basic_block(); // Needed for Python/Guile type coercion + gr_basic_block_sptr to_basic_block(); // Needed for Python type coercion /*! * \brief Confirm that ninputs and noutputs is an acceptable combination. diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h index 9652f6bf4..12bcf10e7 100644 --- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h +++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h @@ -150,7 +150,7 @@ public: // ignored by the user. gr_flat_flowgraph_sptr flatten() const; - gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion + gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion }; inline gr_hier_block2_sptr cast_to_hier_block2_sptr(gr_basic_block_sptr block) { diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.i b/gnuradio-core/src/lib/runtime/gr_hier_block2.i index 32b656e24..4fa7c3bc0 100644 --- a/gnuradio-core/src/lib/runtime/gr_hier_block2.i +++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.i @@ -63,5 +63,5 @@ public: void lock(); void unlock(); - gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion + gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion }; diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i index 0a4eda78a..2a78253b3 100644 --- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i +++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i @@ -105,64 +105,3 @@ gr_msg_queue_sptr.insert_tail = gr_py_msg_queue__insert_tail gr_msg_queue_sptr.handle = gr_py_msg_queue__insert_tail %} #endif // SWIGPYTHON - -/* - * Similar trickery as above, only this time for Guile - */ -#ifdef SWIGGUILE - -%{ - struct arg_holder { - gr_msg_queue_sptr q; - gr_message_sptr msg; - }; - - static void * - insert_tail_shim(void *arg) - { - arg_holder *a = (arg_holder *)arg; - a->q->insert_tail(a->msg); - return 0; - } - - static void * - delete_head_shim(void *arg) - { - arg_holder *a = (arg_holder *)arg; - a->msg = a->q->delete_head(); - return 0; - } -%} - -%inline %{ - - // handle and insert_tail are equivalent - static void - handle(gr_msg_queue_sptr q, gr_message_sptr msg) - { - arg_holder a; - a.q = q; - a.msg = msg; - scm_without_guile(insert_tail_shim, (void *) &a); - } - - static void - insert_tail(gr_msg_queue_sptr q, gr_message_sptr msg) - { - arg_holder a; - a.q = q; - a.msg = msg; - scm_without_guile(insert_tail_shim, (void *) &a); - } - - static gr_message_sptr - delete_head(gr_msg_queue_sptr q) - { - arg_holder a; - a.q = q; - scm_without_guile(delete_head_shim, (void *) &a); - return a.msg; - } -%} - -#endif // SWIGGUILE diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h index 9d01ba3ef..e837700c3 100644 --- a/gnuradio-core/src/lib/runtime/gr_top_block.h +++ b/gnuradio-core/src/lib/runtime/gr_top_block.h @@ -122,7 +122,7 @@ public: //! Set the maximum number of noutput_items in the flowgraph void set_max_noutput_items(int nmax); - gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion + gr_top_block_sptr to_top_block(); // Needed for Python type coercion }; inline gr_top_block_sptr cast_to_top_block_sptr(gr_basic_block_sptr block) { diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-core/src/lib/runtime/gr_top_block.i index 70c627ffd..ea5534c17 100644 --- a/gnuradio-core/src/lib/runtime/gr_top_block.i +++ b/gnuradio-core/src/lib/runtime/gr_top_block.i @@ -51,7 +51,7 @@ public: int max_noutput_items(); void set_max_noutput_items(int nmax); - gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion + gr_top_block_sptr to_top_block(); // Needed for Python type coercion }; #ifdef SWIGPYTHON @@ -73,34 +73,3 @@ void top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error) %} #endif - -#ifdef SWIGGUILE - -%{ - struct tb_arg_holder { - gr_top_block_sptr tb; - }; - - static void * - tb_wait_shim(void *arg) - { - tb_arg_holder *a = (tb_arg_holder *)arg; - a->tb->wait(); - return 0; - } - -%} - -%inline %{ - - static void - top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error) - { - tb_arg_holder a; - a.tb = r; - scm_without_guile(tb_wait_shim, (void *) &a); - } - -%} - -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 972d56c84..35dbd5359 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -39,30 +39,11 @@ %feature("autodoc","1"); -#ifdef SWIGGUILE -// Export constants and enums as scheme variables, not functions. -%feature("constasvar"); -#endif - // local file %include - -// non-local SWIG files -#ifdef SWIGGUILE // Local overrides to support complex -// It's kind of screwy, but the target language subdir isn't -// searched automatically except for under ./swig_lib which -// doesn't really help us since we run swig in many directories -%include -%include -%include -%include -%include -%include -#else %include %include %include -#endif %include typedef std::complex gr_complex; diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index 952bf93b4..e9a44e54b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -30,13 +30,3 @@ %include "gnuradio.i" // the common stuff %include "filter.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") -%} - -%goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index e39a0197a..33f97815e 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -52,13 +52,3 @@ } %} - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index 8753cd36b..b90a5bab3 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -30,13 +30,3 @@ %include "gnuradio.i" // the common stuff %include "gengen.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") -%} - -%goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index bb9c71f53..141d9b163 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -30,13 +30,3 @@ %include "gnuradio.i" // the common stuff %include "hier.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") -%} - -%goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index d2fa0aede..522b12b34 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -30,13 +30,3 @@ %include "gnuradio.i" // the common stuff %include "io.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") -%} - -%goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index 7fcac5069..fb311d226 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -32,28 +32,3 @@ %include "gnuradio.i" // the common stuff %include "runtime.i" - - -#if SWIGGUILE -%scheme %{ - -;; Load our gsubr that loads libraries using the RTLD_GLOBAL option -(load-extension "libguile-gnuradio-dynl-global" "scm_init_gnuradio_dynl_global_module") - -;; Define load-extension-global in module '(guile) -(module-define! (resolve-module '(guile)) - 'load-extension-global - (lambda (lib init) - (dynamic-call init (dynamic-link-global lib)))) - -;; Use load-extension-global to load our swig modules -(load-extension-global "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") -%} - -%goops %{ -(use-modules (gnuradio export-safely)) -(re-export export-syms-if-not-imported-gf) -(re-export-syntax export-safely) -(re-export re-export-all) -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index a080c2b27..79055bd95 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -40,21 +40,3 @@ FULL_NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), %} %enddef #endif - -#ifdef SWIGGUILE -#ifdef IN_GNURADIO_CORE // normal behavior -%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME) -_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME) -/* FIXME May want to add something here to get a friendlier printed representation */ -%enddef -#else // Don't strip PKG from name -%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME) -class FULL_NAME; -typedef boost::shared_ptr FULL_NAME ## _sptr; -%template(FULL_NAME ## _sptr) boost::shared_ptr; -%ignore FULL_NAME; -%rename(FULL_NAME) PKG ## _make_ ## BASE_NAME; -/* FIXME May want to add something here to get a friendlier printed representation */ -%enddef -#endif -#endif diff --git a/gnuradio-pkg_chk.conf b/gnuradio-pkg_chk.conf deleted file mode 100644 index 0c7de2bb6..000000000 --- a/gnuradio-pkg_chk.conf +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2007, 2008 Free Software Foundation - -# pkg_chk -a -k -C gnuradio-pkg_chk.conf -# pkg_chk -a -k -C gnuradio-pkg_chk.conf -D doc - -# This is a control file for pkg_chk, an automatic package manager for -# pkgsrc. After installing pkgsrc, install pkgtools/pkg_chk, use the -# commented-out first line above. The second addtionally includes -# packages needed for documentation. Note that gnuradio is in pkgsrc; -# this file is useful for those who want dependencies from pkgsrc but -# want to build GNU Radio itself from svn. This file should perhaps -# grow conventions for building minimal vs. expanded dependencies. - -# See http://www.netbsd.org/Documentation/software/packages.html for -# more information about pkgsrc. - -# To build against pkgsrc, run configure as -# LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib" CPPFLAGS="-I/usr/pkg/include" ./configure - -# This file is intended to be useful even to those not using pkgsrc by -# crisply listing the dependencies required for GNU Radio. - -# This file may be incorrect; please feel free to correct or mail -# comments to gdt@ir.bbn.com or discuss-gnuradio@gnu.org. - -## Core - -devel/autoconf -devel/automake -devel/libtool-base -# gmake isn't actually required, but it's helpful to have to separate -# real build failures from unportable makefiles. -devel/gmake - -devel/pkg-config - -math/fftwf - -# python is forced by py-Numeric. pkgsrc now (200701) defaults to 2.4, -# which is fine. We don't include python explicitly since we'd have to -# specify a version. -math/py-Numeric -# numarray is not documented to be needed, but the pkgsrc packages depend on it. -# Include it until this confusion is resolved. -math/py-numarray - -# Smart pointers. -devel/boost-headers -# Apparently all of boost is not needed. -#meta-pkgs/boost - -devel/cppunit - -devel/swig - -lang/guile - -## audio -audio/jack -audio/portaudio-devel -devel/SDL - -## documentation - -devel/doxygen doc -textproc/xmlto doc - -## GUI - -x11/py-wxWidgets diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index a15b4d3b9..6fa4438fc 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -72,13 +72,3 @@ class comedi_sink_s : public gr_sync_block { public: ~comedi_sink_s (); }; - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-digital/swig/Makefile.swig.gen b/gr-digital/swig/Makefile.swig.gen deleted file mode 100644 index ff3eff4e9..000000000 --- a/gr-digital/swig/Makefile.swig.gen +++ /dev/null @@ -1,142 +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 digital_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/digital_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/digital_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. - -digital_swig_pythondir_category ?= gnuradio/digital_swig -digital_swig_pylibdir_category ?= $(digital_swig_pythondir_category) -digital_swig_pythondir = $(pythondir)/$(digital_swig_pythondir_category) -digital_swig_pylibdir = $(pyexecdir)/$(digital_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. -digital_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/digital_swig -# FIXME: determince whether these should be installed with gnuradio. -digital_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -digital_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -digital_swig_swiginclude_HEADERS = \ - digital_swig.i \ - $(digital_swig_swiginclude_headers) - -if PYTHON -digital_swig_pylib_LTLIBRARIES = \ - _digital_swig.la - -_digital_swig_la_SOURCES = \ - python/digital_swig.cc \ - $(digital_swig_la_swig_sources) - -digital_swig_python_PYTHON = \ - digital_swig.py \ - $(digital_swig_python) - -_digital_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(digital_swig_la_swig_libadd) - -_digital_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(digital_swig_la_swig_ldflags) - -_digital_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) - -python/digital_swig.cc: digital_swig.py -digital_swig.py: digital_swig.i - -# Include the python dependencies for this file --include python/digital_swig.d - -endif # end of if python - -if GUILE - -digital_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-digital_swig.la -libguile_gnuradio_digital_swig_la_SOURCES = \ - guile/digital_swig.cc \ - $(digital_swig_la_swig_sources) -nobase_digital_swig_scm_DATA = \ - gnuradio/digital_swig.scm \ - gnuradio/digital_swig-primitive.scm -libguile_gnuradio_digital_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(digital_swig_la_swig_libadd) -libguile_gnuradio_digital_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(digital_swig_la_swig_ldflags) -libguile_gnuradio_digital_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(digital_swig_la_swig_cxxflags) - -guile/digital_swig.cc: gnuradio/digital_swig.scm -gnuradio/digital_swig.scm: digital_swig.i -gnuradio/digital_swig-primitive.scm: gnuradio/digital_swig.scm - -# Include the guile dependencies for this file --include guile/digital_swig.d - -endif # end of GUILE diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index a39ef9ab7..4e9c660bc 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -86,21 +86,3 @@ enum snr_est_type_t { %include "digital_probe_mpsk_snr_est_c.i" %include "digital_cpmmod_bc.i" %include "digital_gmskmod_bc.i" - -#if SWIGGUILE - -enum snr_est_type_t { - SNR_EST_SIMPLE = 0, // Simple estimator (>= 7 dB) - SNR_EST_SKEW, // Skewness-base est (>= 5 dB) - SNR_EST_M2M4, // 2nd & 4th moment est (>= 1 dB) - SNR_EST_SVR // SVR-based est (>= 0dB) -}; - -%scheme %{ -(load-extension-global "libguile-gnuradio-digital_swig" "scm_init_gnuradio_digital_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-fcd/swig/Makefile.swig.gen b/gr-fcd/swig/Makefile.swig.gen deleted file mode 100644 index 849e1ea52..000000000 --- a/gr-fcd/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 fcd_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/fcd_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/fcd_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. - -fcd_swig_pythondir_category ?= gnuradio/fcd_swig -fcd_swig_pylibdir_category ?= $(fcd_swig_pythondir_category) -fcd_swig_pythondir = $(pythondir)/$(fcd_swig_pythondir_category) -fcd_swig_pylibdir = $(pyexecdir)/$(fcd_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. -fcd_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/fcd_swig -# FIXME: determince whether these should be installed with gnuradio. -fcd_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -fcd_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -fcd_swig_swiginclude_HEADERS = \ - fcd_swig.i \ - $(fcd_swig_swiginclude_headers) - -if PYTHON -fcd_swig_pylib_LTLIBRARIES = \ - _fcd_swig.la - -_fcd_swig_la_SOURCES = \ - python/fcd_swig.cc \ - $(fcd_swig_la_swig_sources) - -fcd_swig_python_PYTHON = \ - fcd_swig.py \ - $(fcd_swig_python) - -_fcd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(fcd_swig_la_swig_libadd) - -_fcd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(fcd_swig_la_swig_ldflags) - -_fcd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(fcd_swig_la_swig_cxxflags) - -python/fcd_swig.cc: fcd_swig.py -fcd_swig.py: fcd_swig.i - -# Include the python dependencies for this file --include python/fcd_swig.d - -endif # end of if python - -if GUILE - -fcd_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-fcd_swig.la -libguile_gnuradio_fcd_swig_la_SOURCES = \ - guile/fcd_swig.cc \ - $(fcd_swig_la_swig_sources) -nobase_fcd_swig_scm_DATA = \ - gnuradio/fcd_swig.scm \ - gnuradio/fcd_swig-primitive.scm -libguile_gnuradio_fcd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(fcd_swig_la_swig_libadd) -libguile_gnuradio_fcd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(fcd_swig_la_swig_ldflags) -libguile_gnuradio_fcd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(fcd_swig_la_swig_cxxflags) - -guile/fcd_swig.cc: gnuradio/fcd_swig.scm -gnuradio/fcd_swig.scm: fcd_swig.i -gnuradio/fcd_swig-primitive.scm: gnuradio/fcd_swig.scm - -# Include the guile dependencies for this file --include guile/fcd_swig.d - -endif # end of GUILE - - diff --git a/gr-fcd/swig/fcd_swig.i b/gr-fcd/swig/fcd_swig.i index a565fb895..f00ceb421 100644 --- a/gr-fcd/swig/fcd_swig.i +++ b/gr-fcd/swig/fcd_swig.i @@ -30,13 +30,3 @@ %} %include "fcd_source_c.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-fcd_swig" "scm_init_gnuradio_fcd_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-fcd/swig/run_guile_tests.in b/gr-fcd/swig/run_guile_tests.in deleted file mode 100644 index 5d08b0dd5..000000000 --- a/gr-fcd/swig/run_guile_tests.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/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-howto-write-a-block/swig/howto_swig.i b/gr-howto-write-a-block/swig/howto_swig.i index bc2563cd7..dd662b5e5 100644 --- a/gr-howto-write-a-block/swig/howto_swig.i +++ b/gr-howto-write-a-block/swig/howto_swig.i @@ -18,13 +18,3 @@ GR_SWIG_BLOCK_MAGIC(howto,square_ff); GR_SWIG_BLOCK_MAGIC(howto,square2_ff); %include "howto_square2_ff.h" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-howto_swig" "scm_init_gnuradio_howto_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen deleted file mode 100644 index 757c368f5..000000000 --- a/gr-noaa/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 noaa_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/noaa_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/noaa_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. - -noaa_swig_pythondir_category ?= gnuradio/noaa_swig -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) - -## 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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -noaa_swig_swiginclude_HEADERS = \ - noaa_swig.i \ - $(noaa_swig_swiginclude_headers) - -if PYTHON -noaa_swig_pylib_LTLIBRARIES = \ - _noaa_swig.la - -_noaa_swig_la_SOURCES = \ - 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) - -_noaa_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(noaa_swig_la_swig_ldflags) - -_noaa_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(noaa_swig_la_swig_cxxflags) - -python/noaa_swig.cc: noaa_swig.py -noaa_swig.py: noaa_swig.i - -# Include the python dependencies for this file --include python/noaa_swig.d - -endif # end of if python - -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 - -endif # end of GUILE - - diff --git a/gr-noaa/swig/noaa.test b/gr-noaa/swig/noaa.test deleted file mode 100644 index 9a0862fdf..000000000 --- a/gr-noaa/swig/noaa.test +++ /dev/null @@ -1,36 +0,0 @@ -;;; -*- 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 . -;;; - -;;; 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 bc139651d..8f120cfa6 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -34,13 +34,3 @@ %include "noaa_hrpt_decoder.i" %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-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen deleted file mode 100644 index 9f7467c1c..000000000 --- a/gr-pager/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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) - -# 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) - -## 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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## 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) - -if PYTHON -pager_swig_pylib_LTLIBRARIES = \ - _pager_swig.la - -_pager_swig_la_SOURCES = \ - 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) - -_pager_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(pager_swig_la_swig_ldflags) - -_pager_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(pager_swig_la_swig_cxxflags) - -python/pager_swig.cc: pager_swig.py -pager_swig.py: pager_swig.i - -# Include the python dependencies for this file --include python/pager_swig.d - -endif # end of if python - -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 - -endif # end of GUILE - - diff --git a/gr-pager/swig/pager.test b/gr-pager/swig/pager.test deleted file mode 100644 index a5deb5810..000000000 --- a/gr-pager/swig/pager.test +++ /dev/null @@ -1,36 +0,0 @@ -;;; -*- 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 . -;;; - -;;; 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 2cf54c2a7..afa3532b8 100644 --- a/gr-pager/swig/pager_swig.i +++ b/gr-pager/swig/pager_swig.i @@ -37,13 +37,3 @@ %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-qtgui/swig/Makefile.swig.gen b/gr-qtgui/swig/Makefile.swig.gen deleted file mode 100644 index e343db374..000000000 --- a/gr-qtgui/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 qtgui_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/qtgui_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/qtgui_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. - -qtgui_swig_pythondir_category ?= gnuradio/qtgui_swig -qtgui_swig_pylibdir_category ?= $(qtgui_swig_pythondir_category) -qtgui_swig_pythondir = $(pythondir)/$(qtgui_swig_pythondir_category) -qtgui_swig_pylibdir = $(pyexecdir)/$(qtgui_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. -qtgui_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/qtgui_swig -# FIXME: determince whether these should be installed with gnuradio. -qtgui_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -qtgui_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -qtgui_swig_swiginclude_HEADERS = \ - qtgui_swig.i \ - $(qtgui_swig_swiginclude_headers) - -if PYTHON -qtgui_swig_pylib_LTLIBRARIES = \ - _qtgui_swig.la - -_qtgui_swig_la_SOURCES = \ - python/qtgui_swig.cc \ - $(qtgui_swig_la_swig_sources) - -qtgui_swig_python_PYTHON = \ - qtgui_swig.py \ - $(qtgui_swig_python) - -_qtgui_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(qtgui_swig_la_swig_libadd) - -_qtgui_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(qtgui_swig_la_swig_ldflags) - -_qtgui_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(qtgui_swig_la_swig_cxxflags) - -python/qtgui_swig.cc: qtgui_swig.py -qtgui_swig.py: qtgui_swig.i - -# Include the python dependencies for this file --include python/qtgui_swig.d - -endif # end of if python - -if GUILE - -qtgui_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-qtgui_swig.la -libguile_gnuradio_qtgui_swig_la_SOURCES = \ - guile/qtgui_swig.cc \ - $(qtgui_swig_la_swig_sources) -nobase_qtgui_swig_scm_DATA = \ - gnuradio/qtgui_swig.scm \ - gnuradio/qtgui_swig-primitive.scm -libguile_gnuradio_qtgui_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(qtgui_swig_la_swig_libadd) -libguile_gnuradio_qtgui_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(qtgui_swig_la_swig_ldflags) -libguile_gnuradio_qtgui_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(qtgui_swig_la_swig_cxxflags) - -guile/qtgui_swig.cc: gnuradio/qtgui_swig.scm -gnuradio/qtgui_swig.scm: qtgui_swig.i -gnuradio/qtgui_swig-primitive.scm: gnuradio/qtgui_swig.scm - -# Include the guile dependencies for this file --include guile/qtgui_swig.d - -endif # end of GUILE - - diff --git a/gr-shd/swig/Makefile.swig.gen b/gr-shd/swig/Makefile.swig.gen deleted file mode 100644 index ebe843bbe..000000000 --- a/gr-shd/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 shd_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/shd_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/shd_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. - -shd_swig_pythondir_category ?= gnuradio/shd_swig -shd_swig_pylibdir_category ?= $(shd_swig_pythondir_category) -shd_swig_pythondir = $(pythondir)/$(shd_swig_pythondir_category) -shd_swig_pylibdir = $(pyexecdir)/$(shd_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. -shd_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/shd_swig -# FIXME: determince whether these should be installed with gnuradio. -shd_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -shd_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -shd_swig_swiginclude_HEADERS = \ - shd_swig.i \ - $(shd_swig_swiginclude_headers) - -if PYTHON -shd_swig_pylib_LTLIBRARIES = \ - _shd_swig.la - -_shd_swig_la_SOURCES = \ - python/shd_swig.cc \ - $(shd_swig_la_swig_sources) - -shd_swig_python_PYTHON = \ - shd_swig.py \ - $(shd_swig_python) - -_shd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(shd_swig_la_swig_libadd) - -_shd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(shd_swig_la_swig_ldflags) - -_shd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(shd_swig_la_swig_cxxflags) - -python/shd_swig.cc: shd_swig.py -shd_swig.py: shd_swig.i - -# Include the python dependencies for this file --include python/shd_swig.d - -endif # end of if python - -if GUILE - -shd_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-shd_swig.la -libguile_gnuradio_shd_swig_la_SOURCES = \ - guile/shd_swig.cc \ - $(shd_swig_la_swig_sources) -nobase_shd_swig_scm_DATA = \ - gnuradio/shd_swig.scm \ - gnuradio/shd_swig-primitive.scm -libguile_gnuradio_shd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(shd_swig_la_swig_libadd) -libguile_gnuradio_shd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(shd_swig_la_swig_ldflags) -libguile_gnuradio_shd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(shd_swig_la_swig_cxxflags) - -guile/shd_swig.cc: gnuradio/shd_swig.scm -gnuradio/shd_swig.scm: shd_swig.i -gnuradio/shd_swig-primitive.scm: gnuradio/shd_swig.scm - -# Include the guile dependencies for this file --include guile/shd_swig.d - -endif # end of GUILE - - diff --git a/gr-shd/swig/shd.test b/gr-shd/swig/shd.test deleted file mode 100644 index 7b118a081..000000000 --- a/gr-shd/swig/shd.test +++ /dev/null @@ -1,37 +0,0 @@ -;;; -*- 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 . -;;; - -;;; 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 SHD device attached, powered up etc. - -(use-modules (gnuradio shd)) diff --git a/gr-shd/swig/shd_swig.i b/gr-shd/swig/shd_swig.i index 4ff200ec6..5f324a269 100644 --- a/gr-shd/swig/shd_swig.i +++ b/gr-shd/swig/shd_swig.i @@ -125,14 +125,4 @@ static const size_t ALL_MBOARDS = shd::xmini::multi_xmini::ALL_MBOARDS; %} static const size_t ALL_MBOARDS; -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-shd_swig" "scm_init_gnuradio_shd_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif /* SWIGGUILE */ - #endif /* GR_HAVE_SHD */ diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen deleted file mode 100644 index 2d014b946..000000000 --- a/gr-trellis/src/lib/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 trellis.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/trellis -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/trellis -## -## 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. - -trellis_pythondir_category ?= gnuradio/trellis -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) - -## 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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -trellis_swiginclude_HEADERS = \ - trellis.i \ - $(trellis_swiginclude_headers) - -if PYTHON -trellis_pylib_LTLIBRARIES = \ - _trellis.la - -_trellis_la_SOURCES = \ - 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) - -_trellis_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(trellis_la_swig_ldflags) - -_trellis_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(trellis_la_swig_cxxflags) - -python/trellis.cc: trellis.py -trellis.py: trellis.i - -# Include the python dependencies for this file --include python/trellis.d - -endif # end of if python - -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 - -endif # end of GUILE - - diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i index 70775af41..0debf5e5d 100644 --- a/gr-trellis/src/lib/trellis.i +++ b/gr-trellis/src/lib/trellis.i @@ -56,13 +56,3 @@ //%pythoncode %{ // from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT // %} - -#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 deleted file mode 100644 index d370ab18c..000000000 --- a/gr-trellis/src/lib/trellis.test +++ /dev/null @@ -1,53 +0,0 @@ -;;; -*- 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 . -;;; - -;;; 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 - -(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 :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))))) - diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen deleted file mode 100644 index 62adf8958..000000000 --- a/gr-uhd/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 uhd_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/uhd_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/uhd_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. - -uhd_swig_pythondir_category ?= gnuradio/uhd_swig -uhd_swig_pylibdir_category ?= $(uhd_swig_pythondir_category) -uhd_swig_pythondir = $(pythondir)/$(uhd_swig_pythondir_category) -uhd_swig_pylibdir = $(pyexecdir)/$(uhd_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. -uhd_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/uhd_swig -# FIXME: determince whether these should be installed with gnuradio. -uhd_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -uhd_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -uhd_swig_swiginclude_HEADERS = \ - uhd_swig.i \ - $(uhd_swig_swiginclude_headers) - -if PYTHON -uhd_swig_pylib_LTLIBRARIES = \ - _uhd_swig.la - -_uhd_swig_la_SOURCES = \ - python/uhd_swig.cc \ - $(uhd_swig_la_swig_sources) - -uhd_swig_python_PYTHON = \ - uhd_swig.py \ - $(uhd_swig_python) - -_uhd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(uhd_swig_la_swig_libadd) - -_uhd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(uhd_swig_la_swig_ldflags) - -_uhd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(uhd_swig_la_swig_cxxflags) - -python/uhd_swig.cc: uhd_swig.py -uhd_swig.py: uhd_swig.i - -# Include the python dependencies for this file --include python/uhd_swig.d - -endif # end of if python - -if GUILE - -uhd_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-uhd_swig.la -libguile_gnuradio_uhd_swig_la_SOURCES = \ - guile/uhd_swig.cc \ - $(uhd_swig_la_swig_sources) -nobase_uhd_swig_scm_DATA = \ - gnuradio/uhd_swig.scm \ - gnuradio/uhd_swig-primitive.scm -libguile_gnuradio_uhd_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(uhd_swig_la_swig_libadd) -libguile_gnuradio_uhd_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(uhd_swig_la_swig_ldflags) -libguile_gnuradio_uhd_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(uhd_swig_la_swig_cxxflags) - -guile/uhd_swig.cc: gnuradio/uhd_swig.scm -gnuradio/uhd_swig.scm: uhd_swig.i -gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm - -# Include the guile dependencies for this file --include guile/uhd_swig.d - -endif # end of GUILE - - diff --git a/gr-uhd/swig/uhd.test b/gr-uhd/swig/uhd.test deleted file mode 100644 index adc51c884..000000000 --- a/gr-uhd/swig/uhd.test +++ /dev/null @@ -1,37 +0,0 @@ -;;; -*- 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 . -;;; - -;;; 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 UHD device attached, powered up etc. - -(use-modules (gnuradio uhd)) diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 0b2f9febc..053f4a999 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -125,14 +125,4 @@ static const size_t ALL_MBOARDS = uhd::usrp::multi_usrp::ALL_MBOARDS; %} static const size_t ALL_MBOARDS; -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-uhd_swig" "scm_init_gnuradio_uhd_swig_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif /* SWIGGUILE */ - #endif /* GR_HAVE_UHD */ diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen deleted file mode 100644 index ac66bc9a2..000000000 --- a/gr-video-sdl/src/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 video_sdl.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/video_sdl -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/video_sdl -## -## 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. - -video_sdl_pythondir_category ?= gnuradio/video_sdl -video_sdl_pylibdir_category ?= $(video_sdl_pythondir_category) -video_sdl_pythondir = $(pythondir)/$(video_sdl_pythondir_category) -video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_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. -video_sdl_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/video_sdl -# FIXME: determince whether these should be installed with gnuradio. -video_sdl_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -video_sdl_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -video_sdl_swiginclude_HEADERS = \ - video_sdl.i \ - $(video_sdl_swiginclude_headers) - -if PYTHON -video_sdl_pylib_LTLIBRARIES = \ - _video_sdl.la - -_video_sdl_la_SOURCES = \ - python/video_sdl.cc \ - $(video_sdl_la_swig_sources) - -video_sdl_python_PYTHON = \ - video_sdl.py \ - $(video_sdl_python) - -_video_sdl_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(video_sdl_la_swig_libadd) - -_video_sdl_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(video_sdl_la_swig_ldflags) - -_video_sdl_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(video_sdl_la_swig_cxxflags) - -python/video_sdl.cc: video_sdl.py -video_sdl.py: video_sdl.i - -# Include the python dependencies for this file --include python/video_sdl.d - -endif # end of if python - -if GUILE - -video_sdl_scmlib_LTLIBRARIES = \ - libguile-gnuradio-video_sdl.la -libguile_gnuradio_video_sdl_la_SOURCES = \ - guile/video_sdl.cc \ - $(video_sdl_la_swig_sources) -nobase_video_sdl_scm_DATA = \ - gnuradio/video_sdl.scm \ - gnuradio/video_sdl-primitive.scm -libguile_gnuradio_video_sdl_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(video_sdl_la_swig_libadd) -libguile_gnuradio_video_sdl_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(video_sdl_la_swig_ldflags) -libguile_gnuradio_video_sdl_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(video_sdl_la_swig_cxxflags) - -guile/video_sdl.cc: gnuradio/video_sdl.scm -gnuradio/video_sdl.scm: video_sdl.i -gnuradio/video_sdl-primitive.scm: gnuradio/video_sdl.scm - -# Include the guile dependencies for this file --include guile/video_sdl.d - -endif # end of GUILE - - diff --git a/gr-video-sdl/src/video_sdl.i b/gr-video-sdl/src/video_sdl.i index 010851d10..3546adab0 100644 --- a/gr-video-sdl/src/video_sdl.i +++ b/gr-video-sdl/src/video_sdl.i @@ -63,13 +63,3 @@ class video_sdl_sink_s : public gr_sync_block { public: ~video_sdl_sink_s (); }; - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-video_sdl" "scm_init_gnuradio_video_sdl_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-vocoder/swig/Makefile.swig.gen b/gr-vocoder/swig/Makefile.swig.gen deleted file mode 100644 index b0d0504a8..000000000 --- a/gr-vocoder/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 vocoder_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/vocoder_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/vocoder_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. - -vocoder_swig_pythondir_category ?= gnuradio/vocoder_swig -vocoder_swig_pylibdir_category ?= $(vocoder_swig_pythondir_category) -vocoder_swig_pythondir = $(pythondir)/$(vocoder_swig_pythondir_category) -vocoder_swig_pylibdir = $(pyexecdir)/$(vocoder_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. -vocoder_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/vocoder_swig -# FIXME: determince whether these should be installed with gnuradio. -vocoder_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -vocoder_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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -vocoder_swig_swiginclude_HEADERS = \ - vocoder_swig.i \ - $(vocoder_swig_swiginclude_headers) - -if PYTHON -vocoder_swig_pylib_LTLIBRARIES = \ - _vocoder_swig.la - -_vocoder_swig_la_SOURCES = \ - python/vocoder_swig.cc \ - $(vocoder_swig_la_swig_sources) - -vocoder_swig_python_PYTHON = \ - vocoder_swig.py \ - $(vocoder_swig_python) - -_vocoder_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(vocoder_swig_la_swig_libadd) - -_vocoder_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(vocoder_swig_la_swig_ldflags) - -_vocoder_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(vocoder_swig_la_swig_cxxflags) - -python/vocoder_swig.cc: vocoder_swig.py -vocoder_swig.py: vocoder_swig.i - -# Include the python dependencies for this file --include python/vocoder_swig.d - -endif # end of if python - -if GUILE - -vocoder_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-vocoder_swig.la -libguile_gnuradio_vocoder_swig_la_SOURCES = \ - guile/vocoder_swig.cc \ - $(vocoder_swig_la_swig_sources) -nobase_vocoder_swig_scm_DATA = \ - gnuradio/vocoder_swig.scm \ - gnuradio/vocoder_swig-primitive.scm -libguile_gnuradio_vocoder_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(vocoder_swig_la_swig_libadd) -libguile_gnuradio_vocoder_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(vocoder_swig_la_swig_ldflags) -libguile_gnuradio_vocoder_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(vocoder_swig_la_swig_cxxflags) - -guile/vocoder_swig.cc: gnuradio/vocoder_swig.scm -gnuradio/vocoder_swig.scm: vocoder_swig.i -gnuradio/vocoder_swig-primitive.scm: gnuradio/vocoder_swig.scm - -# Include the guile dependencies for this file --include guile/vocoder_swig.d - -endif # end of GUILE - - diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i index 931494307..8e956ff35 100644 --- a/gr-vocoder/swig/vocoder_swig.i +++ b/gr-vocoder/swig/vocoder_swig.i @@ -41,13 +41,3 @@ %include "vocoder_gsm_fr_encode_sp.i" %include "vocoder_ulaw_decode_bs.i" %include "vocoder_ulaw_encode_sb.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-vocoder" "scm_init_gnuradio_gsm_vocoder_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt index 5fdc2b218..558248d08 100644 --- a/gruel/CMakeLists.txt +++ b/gruel/CMakeLists.txt @@ -81,7 +81,6 @@ CPACK_COMPONENT("gruel_swig" # Add subdirectories ######################################################################## add_subdirectory(src/include/gruel) -add_subdirectory(src/scheme/gnuradio) add_subdirectory(src/lib) if(ENABLE_PYTHON) add_subdirectory(src/swig) diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt index a708fa7ad..a8e15cac6 100644 --- a/gruel/src/lib/pmt/CMakeLists.txt +++ b/gruel/src/lib/pmt/CMakeLists.txt @@ -26,9 +26,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ######################################################################## # Generate serial tags header file ######################################################################## -get_filename_component(SCHEME_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/../../scheme/gnuradio ABSOLUTE -) get_filename_component(PMT_SERIAL_TAGS_H ${CMAKE_CURRENT_BINARY_DIR}/../../include/gruel/pmt_serial_tags.h ABSOLUTE @@ -36,11 +33,11 @@ get_filename_component(PMT_SERIAL_TAGS_H add_custom_command( OUTPUT ${PMT_SERIAL_TAGS_H} - DEPENDS ${SCHEME_DIR}/gen-serial-tags.py - DEPENDS ${SCHEME_DIR}/pmt-serial-tags.scm + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm COMMAND ${PYTHON_EXECUTABLE} - ${SCHEME_DIR}/gen-serial-tags.py - ${SCHEME_DIR}/pmt-serial-tags.scm + ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py + ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm ${PMT_SERIAL_TAGS_H} ) diff --git a/gruel/src/lib/pmt/gen-serial-tags.py b/gruel/src/lib/pmt/gen-serial-tags.py new file mode 100644 index 000000000..18e927beb --- /dev/null +++ b/gruel/src/lib/pmt/gen-serial-tags.py @@ -0,0 +1,53 @@ +""" +// +// Copyright 2011 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, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// +// THIS FILE IS MACHINE GENERATED FROM %s. DO NOT EDIT BY HAND. +// See %s for additional commentary. +// + +#ifndef INCLUDED_PMT_SERIAL_TAGS_H +#define INCLUDED_PMT_SERIAL_TAGS_H + +enum pst_tags { +%s +}; +#endif /* INCLUDED_PMT_SERIAL_TAGS_H */ +""" + +import sys, os, re + +if __name__ == '__main__': + if len(sys.argv) != 3: + print "Usage %s "%__file__ + exit() + input_scm_file, output_hdr_file = sys.argv[1:] + enums = list() + for line in open(input_scm_file).readlines(): + match = re.match('^\s*\(define\s+([\w|-]+)\s+#x([0-9a-fA-F]+)\)', line) + if not match: continue + name, value = match.groups() + name = name.upper().replace('-', '_') + enums.append(' %s = 0x%s'%(name, value)) + open(output_hdr_file, 'w').write(__doc__%( + os.path.basename(__file__), + os.path.basename(input_scm_file), + ',\n'.join(enums), + )) diff --git a/gruel/src/lib/pmt/pmt-serial-tags.scm b/gruel/src/lib/pmt/pmt-serial-tags.scm new file mode 100644 index 000000000..646a751ea --- /dev/null +++ b/gruel/src/lib/pmt/pmt-serial-tags.scm @@ -0,0 +1,75 @@ +;;; -*-scheme-*- +;;; +;;; Copyright 2007 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 (define 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, write to the Free Software Foundation, Inc., +;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +;;; + +;;; definitions of tag values used for marshalling pmt data + +(define pst-true #x00) +(define pst-false #x01) +(define pst-symbol #x02) ; untagged-int16 n; followed by n bytes of symbol name +(define pst-int32 #x03) +(define pst-double #x04) +(define pst-complex #x05) ; complex: real, imag +(define pst-null #x06) +(define pst-pair #x07) ; followed by two objects +(define pst-vector #x08) ; untagged-int32 n; followed by n objects +(define pst-dict #x09) ; untagged-int32 n; followed by n key/value tuples + +(define pst-uniform-vector #x0a) + +;; u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, c32, c64 +;; +;; untagged-uint8 tag +;; untagged-uint8 uvi (define uniform vector info, see below) +;; untagged-int32 n-items +;; untagged-uint8 npad +;; npad bytes of zeros to align binary data +;; n-items binary numeric items +;; +;; uvi: +;; +-+-+-+-+-+-+-+-+ +;; |B| subtype | +;; +-+-+-+-+-+-+-+-+ +;; +;; B == 0, numeric data is little-endian. +;; B == 1, numeric data is big-endian. + + (define uvi-endian-mask #x80) + (define uvi-subtype-mask #x7f) + + (define uvi-little-endian #x00) + (define uvi-big-endian #x80) + + (define uvi-u8 #x00) + (define uvi-s8 #x01) + (define uvi-u16 #x02) + (define uvi-s16 #x03) + (define uvi-u32 #x04) + (define uvi-s32 #x05) + (define uvi-u64 #x06) + (define uvi-s64 #x07) + (define uvi-f32 #x08) + (define uvi-f64 #x09) + (define uvi-c32 #x0a) + (define uvi-c64 #x0b) + + +(define pst-comment #x3b) ; ascii ';' +(define pst-comment-end #x0a) ; ascii '\n' diff --git a/gruel/src/scheme/gnuradio/CMakeLists.txt b/gruel/src/scheme/gnuradio/CMakeLists.txt deleted file mode 100644 index 4ff4f7feb..000000000 --- a/gruel/src/scheme/gnuradio/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## - -install(FILES - pmt-serial-tags.scm - pmt-serialize.scm - macros-etc.scm -DESTINATION ${GR_PKG_DATA_DIR} COMPONENT "gruel_swig") diff --git a/gruel/src/scheme/gnuradio/gen-serial-tags.py b/gruel/src/scheme/gnuradio/gen-serial-tags.py deleted file mode 100644 index 18e927beb..000000000 --- a/gruel/src/scheme/gnuradio/gen-serial-tags.py +++ /dev/null @@ -1,53 +0,0 @@ -""" -// -// Copyright 2011 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, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// -// THIS FILE IS MACHINE GENERATED FROM %s. DO NOT EDIT BY HAND. -// See %s for additional commentary. -// - -#ifndef INCLUDED_PMT_SERIAL_TAGS_H -#define INCLUDED_PMT_SERIAL_TAGS_H - -enum pst_tags { -%s -}; -#endif /* INCLUDED_PMT_SERIAL_TAGS_H */ -""" - -import sys, os, re - -if __name__ == '__main__': - if len(sys.argv) != 3: - print "Usage %s "%__file__ - exit() - input_scm_file, output_hdr_file = sys.argv[1:] - enums = list() - for line in open(input_scm_file).readlines(): - match = re.match('^\s*\(define\s+([\w|-]+)\s+#x([0-9a-fA-F]+)\)', line) - if not match: continue - name, value = match.groups() - name = name.upper().replace('-', '_') - enums.append(' %s = 0x%s'%(name, value)) - open(output_hdr_file, 'w').write(__doc__%( - os.path.basename(__file__), - os.path.basename(input_scm_file), - ',\n'.join(enums), - )) diff --git a/gruel/src/scheme/gnuradio/macros-etc.scm b/gruel/src/scheme/gnuradio/macros-etc.scm deleted file mode 100644 index ac2a4a342..000000000 --- a/gruel/src/scheme/gnuradio/macros-etc.scm +++ /dev/null @@ -1,50 +0,0 @@ -;;; -*- scheme -*- -;;; -;;; Copyright 2007 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, write to the Free Software Foundation, Inc., -;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -;;; - -(define-module (gnuradio macros-etc) - :export (atom? when unless for-each-in-file)) - -(define (atom? obj) - (not (pair? obj))) - -(defmacro when (pred . body) - `(if ,pred (begin ,@body) #f)) - -(defmacro unless (pred . body) - `(if (not ,pred) (begin ,@body) #f)) - - -(define (for-each-in-file file f) - (let ((port (if (port? file) - file - (open-input-file file)))) - (letrec - ((loop - (lambda (port form) - (cond ((eof-object? form) - (when (not (eq? port file)) - (close-input-port port)) - #t) - (else - (f form) - (set! form #f) ; for GC - (loop port (read port))))))) - (loop port (read port))))) diff --git a/gruel/src/scheme/gnuradio/pmt-serial-tags.scm b/gruel/src/scheme/gnuradio/pmt-serial-tags.scm deleted file mode 100644 index 646a751ea..000000000 --- a/gruel/src/scheme/gnuradio/pmt-serial-tags.scm +++ /dev/null @@ -1,75 +0,0 @@ -;;; -*-scheme-*- -;;; -;;; Copyright 2007 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 (define 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, write to the Free Software Foundation, Inc., -;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -;;; - -;;; definitions of tag values used for marshalling pmt data - -(define pst-true #x00) -(define pst-false #x01) -(define pst-symbol #x02) ; untagged-int16 n; followed by n bytes of symbol name -(define pst-int32 #x03) -(define pst-double #x04) -(define pst-complex #x05) ; complex: real, imag -(define pst-null #x06) -(define pst-pair #x07) ; followed by two objects -(define pst-vector #x08) ; untagged-int32 n; followed by n objects -(define pst-dict #x09) ; untagged-int32 n; followed by n key/value tuples - -(define pst-uniform-vector #x0a) - -;; u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, c32, c64 -;; -;; untagged-uint8 tag -;; untagged-uint8 uvi (define uniform vector info, see below) -;; untagged-int32 n-items -;; untagged-uint8 npad -;; npad bytes of zeros to align binary data -;; n-items binary numeric items -;; -;; uvi: -;; +-+-+-+-+-+-+-+-+ -;; |B| subtype | -;; +-+-+-+-+-+-+-+-+ -;; -;; B == 0, numeric data is little-endian. -;; B == 1, numeric data is big-endian. - - (define uvi-endian-mask #x80) - (define uvi-subtype-mask #x7f) - - (define uvi-little-endian #x00) - (define uvi-big-endian #x80) - - (define uvi-u8 #x00) - (define uvi-s8 #x01) - (define uvi-u16 #x02) - (define uvi-s16 #x03) - (define uvi-u32 #x04) - (define uvi-s32 #x05) - (define uvi-u64 #x06) - (define uvi-s64 #x07) - (define uvi-f32 #x08) - (define uvi-f64 #x09) - (define uvi-c32 #x0a) - (define uvi-c64 #x0b) - - -(define pst-comment #x3b) ; ascii ';' -(define pst-comment-end #x0a) ; ascii '\n' diff --git a/gruel/src/scheme/gnuradio/pmt-serialize.scm b/gruel/src/scheme/gnuradio/pmt-serialize.scm deleted file mode 100644 index c1d32d75b..000000000 --- a/gruel/src/scheme/gnuradio/pmt-serialize.scm +++ /dev/null @@ -1,48 +0,0 @@ -;;; -;;; Copyright 2007 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, write to the Free Software Foundation, Inc., -;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -;;; - -;;; An implementation of pmt_serialize in scheme. -;;; Currently handles only symbols and pairs. They're all we need for now. - -(define-module (gnuradio pmt-serialize) - :export (pmt-serialize)) - -(load-from-path "gnuradio/pmt-serial-tags") - -(define (pmt-serialize obj put-byte) - (define (put-u16 x) - (put-byte (logand (ash x -8) #xff)) - (put-byte (logand x #xff))) - - (cond ((null? obj) - (put-byte pst-null)) - ((symbol? obj) - (let* ((sym-as-bytes (map char->integer (string->list (symbol->string obj)))) - (len (length sym-as-bytes))) - (put-byte pst-symbol) - (put-u16 len) - (for-each put-byte sym-as-bytes))) - - ((pair? obj) - (put-byte pst-pair) - (pmt-serialize (car obj) put-byte) - (pmt-serialize (cdr obj) put-byte)) - (else - (throw 'not-implemented "pmt-serialize" obj)))) diff --git a/gruel/src/swig/Makefile.swig.gen b/gruel/src/swig/Makefile.swig.gen deleted file mode 100644 index 0abba0299..000000000 --- a/gruel/src/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +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 pmt_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/pmt_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/pmt_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. - -pmt_swig_pythondir_category ?= gnuradio/pmt_swig -pmt_swig_pylibdir_category ?= $(pmt_swig_pythondir_category) -pmt_swig_pythondir = $(pythondir)/$(pmt_swig_pythondir_category) -pmt_swig_pylibdir = $(pyexecdir)/$(pmt_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. -pmt_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/pmt_swig -# FIXME: determince whether these should be installed with gnuradio. -pmt_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -pmt_swig_swigincludedir = $(gruelswigincludedir) - -## 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 > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -pmt_swig_swiginclude_HEADERS = \ - pmt_swig.i \ - $(pmt_swig_swiginclude_headers) - -if PYTHON -pmt_swig_pylib_LTLIBRARIES = \ - _pmt_swig.la - -_pmt_swig_la_SOURCES = \ - python/pmt_swig.cc \ - $(pmt_swig_la_swig_sources) - -pmt_swig_python_PYTHON = \ - pmt_swig.py \ - $(pmt_swig_python) - -_pmt_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(pmt_swig_la_swig_libadd) - -_pmt_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(pmt_swig_la_swig_ldflags) - -_pmt_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(pmt_swig_la_swig_cxxflags) - -python/pmt_swig.cc: pmt_swig.py -pmt_swig.py: pmt_swig.i - -# Include the python dependencies for this file --include python/pmt_swig.d - -endif # end of if python - -if GUILE - -pmt_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-pmt_swig.la -libguile_gnuradio_pmt_swig_la_SOURCES = \ - guile/pmt_swig.cc \ - $(pmt_swig_la_swig_sources) -nobase_pmt_swig_scm_DATA = \ - gnuradio/pmt_swig.scm \ - gnuradio/pmt_swig-primitive.scm -libguile_gnuradio_pmt_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(pmt_swig_la_swig_libadd) -libguile_gnuradio_pmt_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(pmt_swig_la_swig_ldflags) -libguile_gnuradio_pmt_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(pmt_swig_la_swig_cxxflags) - -guile/pmt_swig.cc: gnuradio/pmt_swig.scm -gnuradio/pmt_swig.scm: pmt_swig.i -gnuradio/pmt_swig-primitive.scm: gnuradio/pmt_swig.scm - -# Include the guile dependencies for this file --include guile/pmt_swig.d - -endif # end of GUILE - - -- cgit