[Commit-gnuradio] r3479 - in gnuradio/branches/developers/jcorgan/pager: config gr-pager/src/lib gr-pager/src/python

[jcorgan]

Author: jcorgan
Date: 2006-09-03 21:47:26 -0600 (Sun, 03 Sep 2006)
New Revision: 3479

Added:
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager.i
   
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.cc
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.h
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/qa_pager.py
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/run_tests.in
Modified:
   gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/Makefile.am
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/Makefile.am
Log:
Created module pager with dummy slicer_ff block.

Modified: gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4   
2006-09-04 02:11:34 UTC (rev 3478)
+++ gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4   
2006-09-04 03:47:26 UTC (rev 3479)
@@ -25,11 +25,12 @@
        gr-pager/src/Makefile \
        gr-pager/src/lib/Makefile \
        gr-pager/src/python/Makefile \
+       gr-pager/src/python/run_tests
     ])
 
     passed=yes
     GRC_BUILD_CONDITIONAL([gr-pager],[
         dnl run_tests is created from run_tests.in.  Make it executable.
-        dnl AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x 
gr-pager/src/python/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x 
gr-pager/src/python/run_tests])
     ])
 ])


Property changes on: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in

   + Makefile
Makefile.in
.deps
.libs
pager.cc
pager.py
*.pyc


Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/Makefile.am     
2006-09-04 02:11:34 UTC (rev 3478)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/Makefile.am     
2006-09-04 03:47:26 UTC (rev 3479)
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,73 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = 
+SUBDIRS =
+
+# Install this stuff so that it ends up as the gnuradio.pager module
+# This usually ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/pager
+
+ourpythondir = $(grpythondir)/pager
+ourlibdir    = $(grpyexecdir)/pager
+
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
+
+ALL_IFILES = \
+    $(LOCAL_IFILES) \
+    $(NON_LOCAL_IFILES)                
+
+NON_LOCAL_IFILES = \
+    $(GNURADIO_I)
+
+LOCAL_IFILES = \
+    $(top_srcdir)/gr-pager/src/lib/pager.i                             
+
+# These files are built by SWIG.  The first is the C++ glue.
+# The second is the python wrapper that loads the _howto shared library
+# and knows how to call our extensions.
+
+BUILT_SOURCES = \
+    pager.cc \
+    pager.py                           
+
+# This gets pager.py installed in the right place
+ourpython_PYTHON = \
+    pager.py
+
+ourlib_LTLIBRARIES = _pager.la
+
+# These are the source files that go into the shared library
+_pager_la_SOURCES = \
+    pager.cc \
+    pager_slicer_ff.cc \
+    # Additional source modules here
+
+# magic flags
+_pager_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+
+# link the library against the c++ standard library
+_pager_la_LIBADD = \
+    $(PYTHON_LDFLAGS) \
+    $(GNURADIO_CORE_LIBS) \
+    -lstdc++                   
+
+pager.cc pager.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module pager -o pager.cc $(LOCAL_IFILES)
+
+# These headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = \
+    pager_slicer_ff.h
+    # Additional header files here
+
+# These swig headers get installed in ${prefix}/include/gnuradio/swig
+swiginclude_HEADERS = \
+    $(LOCAL_IFILES)
+
+MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc *~ *.tmp
+
+# Don't distribute output of swig
+dist-hook:
+       @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
+       @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done

Added: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager.i
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager.i         
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager.i 
2006-09-04 03:47:26 UTC (rev 3479)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2005,2006 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+%feature("autodoc","1");
+%include "exception.i"
+%import "gnuradio.i"
+
+%{
+#include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
+#include "pager_slicer_ff.h"
+#include <stdexcept>
+%}
+
+// ----------------------------------------------------------------
+
+GR_SWIG_BLOCK_MAGIC(pager,slicer_ff);
+
+pager_slicer_ff_sptr pager_make_slicer_ff();
+
+class pager_slicer_ff
+{
+private:
+    pager_slicer_ff();
+
+public:
+};
+
+// ----------------------------------------------------------------


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager.i
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.cc  
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.cc  
    2006-09-04 03:47:26 UTC (rev 3479)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2004,2006 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <pager_slicer_ff.h>
+#include <gr_io_signature.h>
+
+pager_slicer_ff_sptr pager_make_slicer_ff()
+{
+  return pager_slicer_ff_sptr(new pager_slicer_ff());
+}
+
+pager_slicer_ff::pager_slicer_ff() :
+    gr_sync_block ("slicer_ff",
+                      gr_make_io_signature (1, 1, sizeof(float)),
+                      gr_make_io_signature (1, 1, sizeof(float)))
+{
+}
+
+int pager_slicer_ff::work(int noutput_items,
+                           gr_vector_const_void_star &input_items,
+                                  gr_vector_void_star &output_items)
+{
+  float *iptr = (float *) input_items[0];
+  float *optr = (float *) output_items[0];
+
+  int size = noutput_items;
+
+  return noutput_items;
+}


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.cc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.h   
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.h   
    2006-09-04 03:47:26 UTC (rev 3479)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2006 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef INCLUDED_PAGER_SLICER_FF_H
+#define INCLUDED_PAGER_SLICER_FF_H
+
+#include <gr_sync_block.h>
+
+class pager_slicer_ff;
+typedef boost::shared_ptr<pager_slicer_ff> pager_slicer_ff_sptr;
+
+pager_slicer_ff_sptr pager_make_slicer_ff();
+
+/*!
+ * \brief slicer description
+ * \ingroup block
+ */
+class pager_slicer_ff : public gr_sync_block
+{
+private:
+    friend pager_slicer_ff_sptr pager_make_slicer_ff();
+    pager_slicer_ff();
+
+public:
+  int work (int noutput_items,
+            gr_vector_const_void_star &input_items, 
+            gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_PAGER_SLICER_FF_H */


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/lib/pager_slicer_ff.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in

   + Makefile
Makefile.in
run_tests


Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/Makefile.am  
2006-09-04 02:11:34 UTC (rev 3478)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/Makefile.am  
2006-09-04 03:47:26 UTC (rev 3479)
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2004,2006 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,13 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = 
+EXTRA_DIST = \
+    run_tests.in
+
+TESTS = \
+    run_tests
+
+noinst_PYTHON = \
+    qa_pager.py
+
+MOSTLYCLEANFILES = *~ *.pyc
\ No newline at end of file

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/qa_pager.py
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/qa_pager.py  
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/qa_pager.py  
2006-09-04 03:47:26 UTC (rev 3479)
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2006 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 2, 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., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+# 
+
+from gnuradio import gr, gr_unittest
+import pager
+
+class qa_pager(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.fg = gr.flow_graph ()
+
+    def tearDown (self):
+        self.fg = None
+
+if __name__ == '__main__':
+    gr_unittest.main ()


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/qa_pager.py
___________________________________________________________________
Name: svn:executable
   + *

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/run_tests.in 
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/python/run_tests.in 
2006-09-04 03:47:26 UTC (rev 3479)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
+
address@hidden@/run_tests.sh \
+    @abs_top_srcdir@/gr-pager \
+    @abs_top_builddir@/gr-pager \
+    @srcdir@