Merge remote branch 'tom/cmake_builds' into next

8 files changed, 0 insertions, 112 deletions

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 <gr_shared_ptr.i>
-
-// 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 <guile/std_complex.i>
-%include <guile/std_vector.i>
-%include <std_common.i>
-%include <std_string.i>
-%include <std_map.i>
-%include <std_pair.i>
-#else
 %include <std_complex.i>
 %include <std_vector.i>
 %include <stl.i>
-#endif
 %include <std_except.i>
 
 typedef std::complex<float>		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: "<gr_block %s (%d)>" % (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> FULL_NAME ## _sptr;
-%template(FULL_NAME ## _sptr) boost::shared_ptr<FULL_NAME>;
-%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