Merge branch 'master' into next

Conflicts: config/Makefile.am configure.ac
author: Johnathan Corgan <jcorgan@corganenterprises.com> 2012-03-22 15:24:38 -0700
committer: Johnathan Corgan <jcorgan@corganenterprises.com> 2012-03-22 15:24:38 -0700
commit: 2e5519b642217fc83324360596ea834cff414ce3 (patch)
tree: 2d976fc654447983dc1414e7a038d076ded20751 /gr-fcd/swig
parent: a21499503e97189644b882ec12210ed4fa501414 (diff)
parent: fc115e6aa0c22af172cbfcb50c895a03218819ba (diff)
5 files changed, 274 insertions, 0 deletions
diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt
new file mode 100644
index 0000000000..7d881c0b41
--- /dev/null
+++ b/gr-fcd/swig/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Copyright 2012 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_FCD_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GR_AUDIO_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcd_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+
+set(GR_SWIG_LIBRARIES gnuradio-fcd)
+
+GR_SWIG_MAKE(fcd_swig fcd_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS fcd_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/fcd
+    COMPONENT "fcd_python"
+)
+
+install(
+    FILES
+    fcd_swig.i
+    fcd_source_c.i
+    ${CMAKE_CURRENT_BINARY_DIR}/fcd_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "fcd_swig"
+)
diff --git a/gr-fcd/swig/Makefile.swig.gen b/gr-fcd/swig/Makefile.swig.gen
new file mode 100644
index 0000000000..849e1ea52d
--- /dev/null
+++ b/gr-fcd/swig/Makefile.swig.gen
@@ -0,0 +1,145 @@
+# -*- 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_source_c.i b/gr-fcd/swig/fcd_source_c.i
new file mode 100644
index 0000000000..3438ab74d2
--- /dev/null
+++ b/gr-fcd/swig/fcd_source_c.i
@@ -0,0 +1,21 @@
+/*
+ * First arg is the package prefix.
+ * Second arg is the name of the class minus the prefix.
+ *
+ * This does some behind-the-scenes magic so we can
+ * access fcd_source_c from python as fcd.source_c
+ */
+GR_SWIG_BLOCK_MAGIC(fcd,source_c);
+
+fcd_source_c_sptr fcd_make_source_c (const std::string device_name = "");
+
+class fcd_source_c : public gr_hier_block2
+{
+public:
+  void set_freq(float freq);
+  void set_freq_khz(int freq);
+  void set_lna_gain(float gain);
+  void set_freq_corr(int ppm);
+  void set_dc_corr(double dci, double dcq);
+  void set_iq_corr(double gain, double phase);
+};
diff --git a/gr-fcd/swig/fcd_swig.i b/gr-fcd/swig/fcd_swig.i
new file mode 100644
index 0000000000..a565fb895d
--- /dev/null
+++ b/gr-fcd/swig/fcd_swig.i
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 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.
+ */
+
+%include "gnuradio.i"
+
+//load generated python docstrings
+%include "fcd_swig_doc.i"
+
+%{
+#include "fcd_source_c.h"
+%}
+
+%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
new file mode 100644
index 0000000000..5d08b0dd53
--- /dev/null
+++ b/gr-fcd/swig/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. @top_builddir@/setup_guile_test_env
+
+# 1st argument is absolute path to hand coded guile source directory
+# 2nd argument is absolute path to component C++ shared library build directory
+# 3nd argument is absolute path to component SWIG build directory
+
+add_local_paths \
+    @srcdir@ \
+    @abs_builddir@ \
+    @abs_builddir@
+
+@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@
author	Johnathan Corgan <jcorgan@corganenterprises.com>	2012-03-22 15:24:38 -0700
committer	Johnathan Corgan <jcorgan@corganenterprises.com>	2012-03-22 15:24:38 -0700
commit	2e5519b642217fc83324360596ea834cff414ce3 (patch)
tree	2d976fc654447983dc1414e7a038d076ded20751 /gr-fcd/swig
parent	a21499503e97189644b882ec12210ed4fa501414 (diff)
parent	fc115e6aa0c22af172cbfcb50c895a03218819ba (diff)