[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10414 - in gnuradio/trunk: gnuradio-core/src/lib/runt
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10414 - in gnuradio/trunk: gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-video-sdl/src usrp/host/lib/legacy |
|
Date: |
Mon, 9 Feb 2009 21:53:38 -0700 (MST) |
Author: jcorgan
Date: 2009-02-09 21:53:37 -0700 (Mon, 09 Feb 2009)
New Revision: 10414
Added:
gnuradio/trunk/gnuradio-core/src/lib/swig/gr_shared_ptr.i
gnuradio/trunk/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
gnuradio/trunk/gnuradio-core/src/lib/swig/sw_runtime.i
Removed:
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_swig_block_magic.i
gnuradio/trunk/gnuradio-core/src/lib/swig/atsc.i
gnuradio/trunk/gnuradio-core/src/lib/swig/shared_ptr.i
Modified:
gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/swig/gnuradio.i
gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i
gnuradio/trunk/gnuradio-core/src/lib/swig/sw_general.i
gnuradio/trunk/gnuradio-core/src/lib/swig/sw_gengen.i
gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i
gnuradio/trunk/gr-atsc/src/lib/atsc.i
gnuradio/trunk/gr-audio-alsa/src/audio_alsa.i
gnuradio/trunk/gr-audio-jack/src/audio_jack.i
gnuradio/trunk/gr-audio-oss/src/audio_oss.i
gnuradio/trunk/gr-audio-osx/src/audio_osx.i
gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio.i
gnuradio/trunk/gr-audio-windows/src/audio_windows.i
gnuradio/trunk/gr-comedi/src/comedi.i
gnuradio/trunk/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
gnuradio/trunk/gr-gcell/src/gcell.i
gnuradio/trunk/gr-gpio/src/lib/gpio.i
gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
gnuradio/trunk/gr-howto-write-a-block/src/lib/howto.i
gnuradio/trunk/gr-msdd6000/src/msdd.i
gnuradio/trunk/gr-pager/src/pager.i
gnuradio/trunk/gr-qtgui/src/lib/qtgui.i
gnuradio/trunk/gr-radio-astronomy/src/lib/ra.i
gnuradio/trunk/gr-trellis/src/lib/trellis.i
gnuradio/trunk/gr-usrp/src/usrp.i
gnuradio/trunk/gr-usrp2/src/usrp2.i
gnuradio/trunk/gr-video-sdl/src/video_sdl.i
gnuradio/trunk/usrp/host/lib/legacy/db_base.i
Log:
Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2004,2007,2008 Free Software Foundation, Inc.
+# Copyright 2003,2004,2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -152,7 +152,6 @@
gr_sync_block.i \
gr_sync_decimator.i \
gr_sync_interpolator.i \
- gr_swig_block_magic.i \
gr_top_block.i \
runtime.i
Deleted: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_swig_block_magic.i
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2009-02-10
04:53:37 UTC (rev 10414)
@@ -35,11 +35,13 @@
LOCAL_IFILES = \
gnuradio.i \
- shared_ptr.i \
+ gr_swig_block_magic.i \
+ gr_shared_ptr.i \
sw_general.i \
sw_gengen.i \
sw_filter.i \
- sw_io.i
+ sw_io.i \
+ sw_runtime.i
ALL_IFILES = \
$(LOCAL_IFILES)
@@ -99,7 +101,7 @@
# ----------------------------------------------------------------
-# Part 1: gnuradio.i -> gnuradio_swig_py_runtime
+# Part 1: sw_runtime.i -> gnuradio_swig_py_runtime
#
# We continue to call this gnuradio.i to avoid having to touch
# lots of code in other modules
@@ -123,8 +125,8 @@
gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.h:
gnuradio_swig_py_runtime.cc
-gnuradio_swig_py_runtime.cc : $(srcdir)/gnuradio.i
- if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td
-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc
$(srcdir)/gnuradio.i ;\
+gnuradio_swig_py_runtime.cc : $(srcdir)/sw_runtime.i
+ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td
-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc
$(srcdir)/sw_runtime.i ;\
then if test $(host_os) = mingw32; \
then sed 's,\\\\,/,g' <gnuradio_swig_py_runtime.Td
>gnuradio_swig_py_runtime.d; rm -f gnuradio_swig_py_runtime.Td; \
else mv -f gnuradio_swig_py_runtime.Td gnuradio_swig_py_runtime.d;
fi \
Deleted: gnuradio/trunk/gnuradio-core/src/lib/swig/atsc.i
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/gnuradio.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/gnuradio.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/gnuradio.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2003,2004 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -25,23 +25,21 @@
// SWIG interface definition
////////////////////////////////////////////////////////////////////////
-
-#ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_swig_py_runtime
-#endif
-
////////////////////////////////////////////////////////////////////////
// Headers
-
%{
+#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include <gr_types.h>
#include <stddef.h> // size_t
%}
%feature("autodoc","1");
-%include <shared_ptr.i>
+// local file
+%include <gr_shared_ptr.i>
+
+// non-local SWIG files
%include <stl.i>
%include <std_complex.i>
%include <std_except.i>
@@ -81,11 +79,9 @@
////////////////////////////////////////////////////////////////////////
-%include <runtime.i>
- // %include <general.i>
- // %include <filter.i>
- // %include <io.i>
+#ifndef SW_RUNTIME
+// import runtime.i for all but sw_runtime, since it needs to %include
+%import <runtime.i>
+#endif
-// %include <atsc.i>
-
////////////////////////////////////////////////////////////////////////
Copied: gnuradio/trunk/gnuradio-core/src/lib/swig/gr_shared_ptr.i (from rev
10413,
gnuradio/branches/developers/michaelld/swig_tweaks/gnuradio-core/src/lib/swig/gr_shared_ptr.i)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/gr_shared_ptr.i
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/gr_shared_ptr.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -0,0 +1,43 @@
+//
+// shared_ptr
+//
+// An enhanced relative of scoped_ptr with reference counted copy semantics.
+// The object pointed to is deleted when the last shared_ptr pointing to it
+// is destroyed or reset.
+//
+
+//
+// This is highly hacked up version of boost::shared_ptr
+// We just need enough to get SWIG to "do the right thing" and
+// generate "Smart Pointer" code.
+//
+
+namespace boost {
+
+template<class T> class shared_ptr
+{
+public:
+
+ shared_ptr()
+ {
+ }
+
+ shared_ptr (T * p)
+ {
+ }
+
+
+ T * operator-> () // never throws
+ {
+ return px;
+ }
+
+
+private:
+
+ T * px; // contained pointer
+ int pn;
+
+}; // shared_ptr
+
+};
\ No newline at end of file
Copied: gnuradio/trunk/gnuradio-core/src/lib/swig/gr_swig_block_magic.i (from
rev 10413,
gnuradio/branches/developers/michaelld/swig_tweaks/gnuradio-core/src/lib/swig/gr_swig_block_magic.i)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
2009-02-10 04:53:37 UTC (rev 10414)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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.
+ */
+
+%define GR_SWIG_BLOCK_MAGIC(PKG, BASE_NAME)
+_GR_SWIG_BLOCK_MAGIC_HELPER(PKG, PKG ## _ ## BASE_NAME, BASE_NAME)
+%enddef
+
+%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME)
+class NAME;
+typedef boost::shared_ptr<NAME> NAME ## _sptr;
+%template(NAME ## _sptr) boost::shared_ptr<NAME>;
+%rename(BASE_NAME) PKG ## _make_ ## BASE_NAME;
+%inline {
+ gr_block_sptr NAME ## _block (NAME ## _sptr r)
+ {
+ return gr_block_sptr (r);
+ }
+}
+
+%pythoncode %{
+NAME ## _sptr.block = lambda self: NAME ## _block (self)
+NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(),
self.unique_id ())
+%}
+
+%ignore NAME;
+%enddef
Deleted: gnuradio/trunk/gnuradio-core/src/lib/swig/shared_ptr.i
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,13 +23,8 @@
%module(directors="1") gnuradio_swig_py_filter
#endif
+ //%feature("autodoc", "1"); // generate python docstrings
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
-%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-%}
-
%include "filter.i"
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_general.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_general.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_general.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,13 +23,8 @@
%module(directors="1") gnuradio_swig_py_general
#endif
+ //%feature("autodoc", "1"); // generate python docstrings
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
-%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-%}
-
%include "general.i"
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_gengen.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_gengen.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_gengen.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,13 +23,8 @@
%module(directors="1") gnuradio_swig_py_gengen
#endif
+ //%feature("autodoc", "1"); // generate python docstrings
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
-%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-%}
-
%include "gengen.i"
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,13 +23,8 @@
%module(directors="1") gnuradio_swig_py_io
#endif
+ //%feature("autodoc", "1"); // generate python docstrings
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
-%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-%}
-
%include "io.i"
Copied: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_runtime.i (from rev 10413,
gnuradio/branches/developers/michaelld/swig_tweaks/gnuradio-core/src/lib/swig/sw_runtime.i)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_runtime.i
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_runtime.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_swig_py_runtime
+#endif
+
+ //%feature("autodoc", "1"); // generate python docstrings
+
+#define SW_RUNTIME
+%include "gnuradio.i" // the common stuff
+
+%include "runtime.i"
Modified: gnuradio/trunk/gr-atsc/src/lib/atsc.i
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,13 +1,28 @@
/* -*- c++ -*- */
+/*
+ * 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.
+ */
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-#include <stdexcept>
#include <atsc_randomizer.h>
#include <atsc_derandomizer.h>
#include <atsc_rs_encoder.h>
Modified: gnuradio/trunk/gr-audio-alsa/src/audio_alsa.i
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/audio_alsa.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/gr-audio-alsa/src/audio_alsa.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_alsa_sink.h"
#include "audio_alsa_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-audio-jack/src/audio_jack.i
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/audio_jack.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/gr-audio-jack/src/audio_jack.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_jack_sink.h"
#include "audio_jack_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-audio-oss/src/audio_oss.i
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/audio_oss.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-audio-oss/src/audio_oss.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_oss_sink.h"
#include "audio_oss_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-audio-osx/src/audio_osx.i
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/audio_osx.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-audio-osx/src/audio_osx.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio.
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_osx_sink.h"
#include "audio_osx_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio.i
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_portaudio_sink.h"
#include "audio_portaudio_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-audio-windows/src/audio_windows.i
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/audio_windows.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/gr-audio-windows/src/audio_windows.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "audio_windows_sink.h"
#include "audio_windows_source.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-comedi/src/comedi.i
===================================================================
--- gnuradio/trunk/gr-comedi/src/comedi.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-comedi/src/comedi.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "comedi_sink_s.h"
#include "comedi_source_s.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,15 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
-%include "exception.i"
-%import "gnuradio.i"
+%include "gnuradio.i"
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "cvsd_encode_sb.h"
#include "cvsd_decode_bs.h"
-#include <stdexcept>
%}
GR_SWIG_BLOCK_MAGIC(cvsd,encode_sb);
Modified: gnuradio/trunk/gr-gcell/src/gcell.i
===================================================================
--- gnuradio/trunk/gr-gcell/src/gcell.i 2009-02-09 20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-gcell/src/gcell.i 2009-02-10 04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -19,18 +19,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-//%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-//#include <stdexcept>
-
#include <gcell/gc_job_manager.h>
-#include <gcell_fft_vcc.h>
-
+#include <gcell_fft_vcc.h>
%}
%include "gc_job_manager.i"
Modified: gnuradio/trunk/gr-gpio/src/lib/gpio.i
===================================================================
--- gnuradio/trunk/gr-gpio/src/lib/gpio.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-gpio/src/lib/gpio.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,14 +1,29 @@
/* -*- c++ -*- */
+/*
+ * 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.
+ */
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "gpio_and_const_ss.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,15 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
-%include "exception.i"
-%import "gnuradio.i"
+%include "gnuradio.i"
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "gsm_fr_encode_sp.h"
#include "gsm_fr_decode_ps.h"
-#include <stdexcept>
%}
GR_SWIG_BLOCK_MAGIC(gsm_fr,encode_sp);
Modified: gnuradio/trunk/gr-howto-write-a-block/src/lib/howto.i
===================================================================
--- gnuradio/trunk/gr-howto-write-a-block/src/lib/howto.i 2009-02-09
20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-howto-write-a-block/src/lib/howto.i 2009-02-10
04:53:37 UTC (rev 10414)
@@ -1,15 +1,10 @@
/* -*- c++ -*- */
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "howto_square_ff.h"
#include "howto_square2_ff.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-msdd6000/src/msdd.i
===================================================================
--- gnuradio/trunk/gr-msdd6000/src/msdd.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-msdd6000/src/msdd.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -20,12 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "msdd_source_s.h"
#include "msdd_source_c.h"
#include "msdd_source_simple.h"
Modified: gnuradio/trunk/gr-pager/src/pager.i
===================================================================
--- gnuradio/trunk/gr-pager/src/pager.i 2009-02-09 20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-pager/src/pager.i 2009-02-10 04:53:37 UTC (rev 10414)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005,2006 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -19,18 +19,14 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
-%include "exception.i"
-%import "gnuradio.i"
+%include "gnuradio.i"
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "pager_flex_frame.h"
#include "pager_slicer_fb.h"
#include "pager_flex_sync.h"
#include "pager_flex_deinterleave.h"
#include "pager_flex_parse.h"
-#include <stdexcept>
%}
%include "pager_flex_frame.i"
Modified: gnuradio/trunk/gr-qtgui/src/lib/qtgui.i
===================================================================
--- gnuradio/trunk/gr-qtgui/src/lib/qtgui.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-qtgui/src/lib/qtgui.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,15 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
-%include "exception.i"
-%import "gnuradio.i"
+%include "gnuradio.i"
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "qtgui_sink_c.h"
#include "qtgui_sink_f.h"
-#include <stdexcept>
%}
GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
Modified: gnuradio/trunk/gr-radio-astronomy/src/lib/ra.i
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/lib/ra.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/gr-radio-astronomy/src/lib/ra.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,15 +1,27 @@
/* -*- c++ -*- */
+/*
+ * 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.
+ */
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
-%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-#include <stdexcept>
-%}
-
// We'll need something like this if we add C++ blocks...
// See the gr-howto-write-a-block tarball for examples
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis.i
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,18 +1,33 @@
/* -*- c++ -*- */
+/*
+ * 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.
+ */
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "fsm.h"
#include "interleaver.h"
#include "trellis_permutation.h"
#include "trellis_siso_f.h"
#include "trellis_siso_combined_f.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-usrp/src/usrp.i
===================================================================
--- gnuradio/trunk/gr-usrp/src/usrp.i 2009-02-09 20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-usrp/src/usrp.i 2009-02-10 04:53:37 UTC (rev 10414)
@@ -20,12 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include <vector>
%}
Modified: gnuradio/trunk/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2.i 2009-02-09 20:05:36 UTC (rev 10413)
+++ gnuradio/trunk/gr-usrp2/src/usrp2.i 2009-02-10 04:53:37 UTC (rev 10414)
@@ -20,13 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc", "1"); // generate python docstrings
+%include "gnuradio.i" // the common stuff
+%import <stdint.i>
-%import "gnuradio.i" // the common stuff
-%import <stdint.i>
-
%{
-#include <gnuradio_swig_bug_workaround.h>
#include "usrp2_source_16sc.h"
#include "usrp2_source_32fc.h"
#include "usrp2_sink_16sc.h"
Modified: gnuradio/trunk/gr-video-sdl/src/video_sdl.i
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/video_sdl.i 2009-02-09 20:05:36 UTC (rev
10413)
+++ gnuradio/trunk/gr-video-sdl/src/video_sdl.i 2009-02-10 04:53:37 UTC (rev
10414)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,16 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc","1");
+%include "gnuradio.i" // the common stuff
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
-
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "video_sdl_sink_uc.h"
#include "video_sdl_sink_s.h"
-#include <stdexcept>
%}
// ----------------------------------------------------------------
Modified: gnuradio/trunk/usrp/host/lib/legacy/db_base.i
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/db_base.i 2009-02-09 20:05:36 UTC
(rev 10413)
+++ gnuradio/trunk/usrp/host/lib/legacy/db_base.i 2009-02-10 04:53:37 UTC
(rev 10414)
@@ -1,12 +1,12 @@
/* -*- c++ -*- */
//
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,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 asversion 3, or (at your option)
+// 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,
@@ -25,7 +25,7 @@
#include "db_base.h"
%}
-%include <shared_ptr.i>
+%include <gr_shared_ptr.i>
class usrp_tune_result
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10414 - in gnuradio/trunk: gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-video-sdl/src usrp/host/lib/legacy,
jcorgan <=