diff options
author | Johnathan Corgan | 2009-10-16 12:22:42 -0700 |
---|---|---|
committer | Johnathan Corgan | 2009-11-03 07:21:42 -0800 |
commit | 96c92bb05fdbd2d42bb485bee46e63931d465cc3 (patch) | |
tree | 0fe809434adc8a1679eb079cce2fb758b3991928 | |
parent | 5a0887f9138dc4dd0e8e09bb859a513bd7c971e2 (diff) | |
download | gnuradio-96c92bb05fdbd2d42bb485bee46e63931d465cc3.tar.gz gnuradio-96c92bb05fdbd2d42bb485bee46e63931d465cc3.tar.bz2 gnuradio-96c92bb05fdbd2d42bb485bee46e63931d465cc3.zip |
Directory reorganization to newer layout
Top-level applications go into 'apps' (previous commit)
C++ library build goes into 'lib'
SWIG generation goes into 'swig'
Pure python modules/code goes into 'python'
-rw-r--r-- | config/grc_gr_pager.m4 | 10 | ||||
-rw-r--r-- | gr-pager/Makefile.am | 4 | ||||
-rw-r--r-- | gr-pager/lib/.gitignore | 4 | ||||
-rw-r--r-- | gr-pager/lib/Makefile.am (renamed from gr-pager/src/Makefile.am) | 43 | ||||
-rw-r--r-- | gr-pager/lib/Makefile.swig.gen (renamed from gr-pager/src/Makefile.swig.gen) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_deinterleave.cc (renamed from gr-pager/src/pager_flex_deinterleave.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_deinterleave.h (renamed from gr-pager/src/pager_flex_deinterleave.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_frame.cc (renamed from gr-pager/src/pager_flex_frame.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_frame.h (renamed from gr-pager/src/pager_flex_frame.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_parse.cc (renamed from gr-pager/src/pager_flex_parse.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_parse.h (renamed from gr-pager/src/pager_flex_parse.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_sync.cc (renamed from gr-pager/src/pager_flex_sync.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_sync.h (renamed from gr-pager/src/pager_flex_sync.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_slicer_fb.cc (renamed from gr-pager/src/pager_slicer_fb.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pager_slicer_fb.h (renamed from gr-pager/src/pager_slicer_fb.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_bch3221.cc (renamed from gr-pager/src/pageri_bch3221.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_bch3221.h (renamed from gr-pager/src/pageri_bch3221.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_flex_modes.cc (renamed from gr-pager/src/pageri_flex_modes.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_flex_modes.h (renamed from gr-pager/src/pageri_flex_modes.h) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_util.cc (renamed from gr-pager/src/pageri_util.cc) | 0 | ||||
-rw-r--r-- | gr-pager/lib/pageri_util.h (renamed from gr-pager/src/pageri_util.h) | 0 | ||||
-rw-r--r-- | gr-pager/python/.gitignore | 2 | ||||
-rw-r--r-- | gr-pager/python/Makefile.am | 39 | ||||
-rw-r--r-- | gr-pager/python/__init__.py (renamed from gr-pager/src/__init__.py) | 0 | ||||
-rw-r--r-- | gr-pager/python/flex_demod.py (renamed from gr-pager/src/flex_demod.py) | 0 | ||||
-rw-r--r-- | gr-pager/python/pager_utils.py (renamed from gr-pager/src/pager_utils.py) | 0 | ||||
-rwxr-xr-x | gr-pager/python/qa_pager.py (renamed from gr-pager/src/qa_pager.py) | 0 | ||||
-rw-r--r-- | gr-pager/python/run_tests.in (renamed from gr-pager/src/run_tests.in) | 0 | ||||
-rw-r--r-- | gr-pager/src/pager_swig.i | 89 | ||||
-rw-r--r-- | gr-pager/swig/.gitignore (renamed from gr-pager/src/.gitignore) | 2 | ||||
-rw-r--r-- | gr-pager/swig/Makefile.am | 60 | ||||
-rw-r--r-- | gr-pager/swig/Makefile.swig.gen | 259 | ||||
-rw-r--r-- | gr-pager/swig/pager_flex_deinterleave.i | 11 | ||||
-rw-r--r-- | gr-pager/swig/pager_flex_frame.i (renamed from gr-pager/src/pager_flex_frame.i) | 0 | ||||
-rw-r--r-- | gr-pager/swig/pager_flex_parse.i | 11 | ||||
-rw-r--r-- | gr-pager/swig/pager_flex_sync.i | 11 | ||||
-rw-r--r-- | gr-pager/swig/pager_slicer_fb.i | 12 | ||||
-rw-r--r-- | gr-pager/swig/pager_swig.i | 36 | ||||
-rw-r--r-- | run_tests.sh.in | 2 |
39 files changed, 454 insertions, 141 deletions
diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4 index 8b4932194..3f36dfffb 100644 --- a/config/grc_gr_pager.m4 +++ b/config/grc_gr_pager.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2006,2008,2009 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,12 +27,14 @@ AC_DEFUN([GRC_GR_PAGER],[ gr-pager/Makefile \ gr-pager/gnuradio-pager.pc \ gr-pager/apps/Makefile \ - gr-pager/src/Makefile \ - gr-pager/src/run_tests + gr-pager/lib/Makefile \ + gr-pager/python/Makefile \ + gr-pager/python/run_tests \ + gr-pager/swig/Makefile \ ]) GRC_BUILD_CONDITIONAL(gr-pager,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/src/run_tests]) + AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/python/run_tests]) ]) ]) diff --git a/gr-pager/Makefile.am b/gr-pager/Makefile.am index 984e64798..c302cd5df 100644 --- a/gr-pager/Makefile.am +++ b/gr-pager/Makefile.am @@ -21,10 +21,10 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = src +SUBDIRS = lib if PYTHON -SUBDIRS += apps +SUBDIRS += swig python apps endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/gr-pager/lib/.gitignore b/gr-pager/lib/.gitignore new file mode 100644 index 000000000..1b6114c39 --- /dev/null +++ b/gr-pager/lib/.gitignore @@ -0,0 +1,4 @@ +/.libs +/.deps +/Makefile +/Makefile.in diff --git a/gr-pager/src/Makefile.am b/gr-pager/lib/Makefile.am index 8a9f90d59..42053eb17 100644 --- a/gr-pager/src/Makefile.am +++ b/gr-pager/lib/Makefile.am @@ -25,9 +25,6 @@ EXTRA_DIST = run_tests.in AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -noinst_PYTHON = \ - qa_pager.py - # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ pager_slicer_fb.h \ @@ -56,43 +53,3 @@ libgnuradio_pager_la_LIBADD = \ libgnuradio_pager_la_LDFLAGS = \ $(NO_UNDEFINED) - -if PYTHON - -############################## -# SWIG interface and library -TESTS = run_tests -DISTCLEANFILES = run_tests - -TOP_SWIG_IFILES = \ - pager_swig.i - -# Install so that they end up available as: -# import gnuradio.pager -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio/pager -pager_swig_pythondir_category = \ - gnuradio/pager - -# additional libraries for linking with the SWIG-generated library -pager_swig_la_swig_libadd = \ - libgnuradio-pager.la - -# additional Python files to be installed along with the SWIG-generated one -pager_swig_python = \ - __init__.py \ - pager_utils.py \ - flex_demod.py - -# additional SWIG files to be installed -pager_swig_swiginclude_headers = \ - pager_flex_frame.i - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-pager/src/Makefile.swig.gen b/gr-pager/lib/Makefile.swig.gen index 5cfbc66be..5cfbc66be 100644 --- a/gr-pager/src/Makefile.swig.gen +++ b/gr-pager/lib/Makefile.swig.gen diff --git a/gr-pager/src/pager_flex_deinterleave.cc b/gr-pager/lib/pager_flex_deinterleave.cc index 25ea22e39..25ea22e39 100644 --- a/gr-pager/src/pager_flex_deinterleave.cc +++ b/gr-pager/lib/pager_flex_deinterleave.cc diff --git a/gr-pager/src/pager_flex_deinterleave.h b/gr-pager/lib/pager_flex_deinterleave.h index 7211a71ad..7211a71ad 100644 --- a/gr-pager/src/pager_flex_deinterleave.h +++ b/gr-pager/lib/pager_flex_deinterleave.h diff --git a/gr-pager/src/pager_flex_frame.cc b/gr-pager/lib/pager_flex_frame.cc index b707dbbc4..b707dbbc4 100644 --- a/gr-pager/src/pager_flex_frame.cc +++ b/gr-pager/lib/pager_flex_frame.cc diff --git a/gr-pager/src/pager_flex_frame.h b/gr-pager/lib/pager_flex_frame.h index 1f4999e2b..1f4999e2b 100644 --- a/gr-pager/src/pager_flex_frame.h +++ b/gr-pager/lib/pager_flex_frame.h diff --git a/gr-pager/src/pager_flex_parse.cc b/gr-pager/lib/pager_flex_parse.cc index 0819294da..0819294da 100644 --- a/gr-pager/src/pager_flex_parse.cc +++ b/gr-pager/lib/pager_flex_parse.cc diff --git a/gr-pager/src/pager_flex_parse.h b/gr-pager/lib/pager_flex_parse.h index 0f7cfb370..0f7cfb370 100644 --- a/gr-pager/src/pager_flex_parse.h +++ b/gr-pager/lib/pager_flex_parse.h diff --git a/gr-pager/src/pager_flex_sync.cc b/gr-pager/lib/pager_flex_sync.cc index 6bcee8ede..6bcee8ede 100644 --- a/gr-pager/src/pager_flex_sync.cc +++ b/gr-pager/lib/pager_flex_sync.cc diff --git a/gr-pager/src/pager_flex_sync.h b/gr-pager/lib/pager_flex_sync.h index b401bf532..b401bf532 100644 --- a/gr-pager/src/pager_flex_sync.h +++ b/gr-pager/lib/pager_flex_sync.h diff --git a/gr-pager/src/pager_slicer_fb.cc b/gr-pager/lib/pager_slicer_fb.cc index d419db78a..d419db78a 100644 --- a/gr-pager/src/pager_slicer_fb.cc +++ b/gr-pager/lib/pager_slicer_fb.cc diff --git a/gr-pager/src/pager_slicer_fb.h b/gr-pager/lib/pager_slicer_fb.h index 75eea3cd3..75eea3cd3 100644 --- a/gr-pager/src/pager_slicer_fb.h +++ b/gr-pager/lib/pager_slicer_fb.h diff --git a/gr-pager/src/pageri_bch3221.cc b/gr-pager/lib/pageri_bch3221.cc index 984ed4d44..984ed4d44 100644 --- a/gr-pager/src/pageri_bch3221.cc +++ b/gr-pager/lib/pageri_bch3221.cc diff --git a/gr-pager/src/pageri_bch3221.h b/gr-pager/lib/pageri_bch3221.h index 9dd2be86a..9dd2be86a 100644 --- a/gr-pager/src/pageri_bch3221.h +++ b/gr-pager/lib/pageri_bch3221.h diff --git a/gr-pager/src/pageri_flex_modes.cc b/gr-pager/lib/pageri_flex_modes.cc index 4553e0bf3..4553e0bf3 100644 --- a/gr-pager/src/pageri_flex_modes.cc +++ b/gr-pager/lib/pageri_flex_modes.cc diff --git a/gr-pager/src/pageri_flex_modes.h b/gr-pager/lib/pageri_flex_modes.h index bc53c12bf..bc53c12bf 100644 --- a/gr-pager/src/pageri_flex_modes.h +++ b/gr-pager/lib/pageri_flex_modes.h diff --git a/gr-pager/src/pageri_util.cc b/gr-pager/lib/pageri_util.cc index bdd095706..bdd095706 100644 --- a/gr-pager/src/pageri_util.cc +++ b/gr-pager/lib/pageri_util.cc diff --git a/gr-pager/src/pageri_util.h b/gr-pager/lib/pageri_util.h index 78ae7aab3..78ae7aab3 100644 --- a/gr-pager/src/pageri_util.h +++ b/gr-pager/lib/pageri_util.h diff --git a/gr-pager/python/.gitignore b/gr-pager/python/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-pager/python/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-pager/python/Makefile.am b/gr-pager/python/Makefile.am new file mode 100644 index 000000000..f80375c7c --- /dev/null +++ b/gr-pager/python/Makefile.am @@ -0,0 +1,39 @@ +# +# Copyright 2004,2005,2006,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 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 $(top_srcdir)/Makefile.common + +if PYTHON +pagerdir = $(grpythondir)/pager + +noinst_PYTHON = \ + qa_pager.py + +pager_PYTHON = \ + __init__.py \ + pager_utils.py \ + flex_demod.py + +TESTS = run_tests + +EXTRA_DIST = run_tests.in + +endif diff --git a/gr-pager/src/__init__.py b/gr-pager/python/__init__.py index 664b79942..664b79942 100644 --- a/gr-pager/src/__init__.py +++ b/gr-pager/python/__init__.py diff --git a/gr-pager/src/flex_demod.py b/gr-pager/python/flex_demod.py index b79c1adaa..b79c1adaa 100644 --- a/gr-pager/src/flex_demod.py +++ b/gr-pager/python/flex_demod.py diff --git a/gr-pager/src/pager_utils.py b/gr-pager/python/pager_utils.py index 72aac6826..72aac6826 100644 --- a/gr-pager/src/pager_utils.py +++ b/gr-pager/python/pager_utils.py diff --git a/gr-pager/src/qa_pager.py b/gr-pager/python/qa_pager.py index 5bf72b561..5bf72b561 100755 --- a/gr-pager/src/qa_pager.py +++ b/gr-pager/python/qa_pager.py diff --git a/gr-pager/src/run_tests.in b/gr-pager/python/run_tests.in index 6bb0c3980..6bb0c3980 100644 --- a/gr-pager/src/run_tests.in +++ b/gr-pager/python/run_tests.in diff --git a/gr-pager/src/pager_swig.i b/gr-pager/src/pager_swig.i deleted file mode 100644 index aeb576db7..000000000 --- a/gr-pager/src/pager_swig.i +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2005,2006,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. - */ - -%include "gnuradio.i" - -%{ -#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 "pager_flex_frame.i" - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(pager,slicer_fb); - -pager_slicer_fb_sptr pager_make_slicer_fb(float alpha); - -class pager_slicer_fb : public gr_sync_block -{ -private: - pager_slicer_fb(float alpha); - -public: - float dc_offset() const { return d_avg; } -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(pager,flex_sync); - -pager_flex_sync_sptr pager_make_flex_sync(); - -class pager_flex_sync : public gr_block -{ -private: - pager_flex_sync(); - -public: -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(pager,flex_deinterleave); - -pager_flex_deinterleave_sptr pager_make_flex_deinterleave(); - -class pager_flex_deinterleave : public gr_sync_decimator -{ -private: - pager_flex_deinterleave(); - -public: -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(pager,flex_parse); - -pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq); - -class pager_flex_parse : public gr_block -{ -private: - pager_flex_parse(gr_msg_queue_sptr queue, float freq); - -public: -}; diff --git a/gr-pager/src/.gitignore b/gr-pager/swig/.gitignore index 3e806d690..6df28c365 100644 --- a/gr-pager/src/.gitignore +++ b/gr-pager/swig/.gitignore @@ -1,5 +1,3 @@ -/.libs -/.deps /Makefile /Makefile.in /pager_swig.py diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am new file mode 100644 index 000000000..890459cb6 --- /dev/null +++ b/gr-pager/swig/Makefile.am @@ -0,0 +1,60 @@ +# +# Copyright 2004,2005,2006,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 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 $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + $(PYTHON_CPPFLAGS) \ + $(WITH_INCLUDES) \ + -I$(top_srcdir)/gr-pager/lib + +############################## +# SWIG interface and library +TOP_SWIG_IFILES = \ + pager_swig.i + +# Install so that they end up available as: +# import gnuradio.pager +# This ends up at: +# ${prefix}/lib/python${python_version}/site-packages/gnuradio/pager +pager_swig_pythondir_category = \ + gnuradio/pager + +# additional libraries for linking with the SWIG-generated library +pager_swig_la_swig_libadd = \ + $(builddir)/../lib/libgnuradio-pager.la + +# additional SWIG files to be installed +pager_swig_swiginclude_headers = \ + pager_flex_deinterleave.i \ + pager_flex_frame.i \ + pager_flex_parse.i \ + pager_flex_sync.i \ + pager_slicer_fb.i + +include $(top_srcdir)/Makefile.swig + +# add some of the variables generated inside the Makefile.swig.gen +BUILT_SOURCES = $(swig_built_sources) + +# Do not distribute the output of SWIG +no_dist_files = $(swig_built_sources) diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen new file mode 100644 index 000000000..5cfbc66be --- /dev/null +++ b/gr-pager/swig/Makefile.swig.gen @@ -0,0 +1,259 @@ +# -*- 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) + +## 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 > + +## Stamps used to ensure parallel make does the right thing. These +## are removed by "make clean", but otherwise unused except during the +## parallel built. These will not be included in a tarball, because +## the SWIG-generated files will be removed from the distribution. + +STAMPS += $(DEPDIR)/pager_swig-generate-* + +## Other cleaned files: dependency files generated by SWIG or this Makefile + +MOSTLYCLEANFILES += $(DEPDIR)/*.S* + +## Add the .py and .cc files to the list of SWIG built sources. The +## .h file is sometimes built, but not always ... so that one has to +## be added manually by the including Makefile.am . + +swig_built_sources += pager_swig.py pager_swig.cc + +## 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) + +pager_swig_pylib_LTLIBRARIES = \ + _pager_swig.la + +_pager_swig_la_SOURCES = \ + pager_swig.cc \ + $(pager_swig_la_swig_sources) + +_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) \ + $(pager_swig_la_swig_cxxflags) + +pager_swig_python_PYTHON = \ + pager_swig.py \ + $(pager_swig_python) + +## Entry rule for running SWIG + +pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i +## This rule will get called only when MAKE decides that one of the +## targets needs to be created or re-created, because: +## +## * The .i file is newer than any or all of the generated files; +## +## * Any or all of the .cc, .h, or .py files does not exist and is +## needed (in the case this file is not needed, the rule for it is +## ignored); or +## +## * Some SWIG-based dependecy of the .cc file isn't met and hence the +## .cc file needs be be regenerated. Explanation: Because MAKE +## knows how to handle dependencies for .cc files (regardless of +## their name or extension), then the .cc file is used as a target +## instead of the .i file -- but with the dependencies of the .i +## file. It is this last reason why the line: +## +## if test -f $@; then :; else +## +## cannot be used in this case: If a .i file dependecy is not met, +## then the .cc file needs to be rebuilt. But if the stamp is newer +## than the .cc file, and the .cc file exists, then in the original +## version (with the 'test' above) the internal MAKE call will not +## be issued and hence the .cc file will not be rebuilt. +## +## Once execution gets to here, it should always proceed no matter the +## state of a stamp (as discussed in link above). The +## $(DEPDIR)/pager_swig-generate stuff is used to allow for parallel +## builds to "do the right thing". The stamp has no relationship with +## either the target files or dependency file; it is used solely for +## the protection of multiple builds during a given call to MAKE. +## +## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM +## (15). At a caught signal, the quoted command will be issued before +## exiting. In this case, remove any stamp, whether temporary of not. +## The trap is valid until the process exits; the process includes all +## commands appended via "\"s. +## + trap 'rm -rf $(DEPDIR)/pager_swig-generate-*' 1 2 13 15; \ +## +## Create a temporary directory, which acts as a lock. The first +## process to create the directory will succeed and issue the MAKE +## command to do the actual work, while all subsequent processes will +## fail -- leading them to wait for the first process to finish. +## + if mkdir $(DEPDIR)/pager_swig-generate-lock 2>/dev/null; then \ +## +## This code is being executed by the first process to succeed in +## creating the directory lock. +## +## Remove the stamp associated with this filename. +## + rm -f $(DEPDIR)/pager_swig-generate-stamp; \ +## +## Tell MAKE to run the rule for creating this stamp. +## + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-stamp WHAT=$<; \ +## +## Now that the .cc, .h, and .py files have been (re)created from the +## .i file, future checking of this rule during the same MAKE +## execution will come back that the rule doesn't need to be executed +## because none of the conditions mentioned at the start of this rule +## will be positive. Remove the the directory lock, which frees up +## any waiting process(es) to continue. +## + rmdir $(DEPDIR)/pager_swig-generate-lock; \ + else \ +## +## This code is being executed by any follower processes while the +## directory lock is in place. +## +## Wait until the first process is done, testing once per second. +## + while test -d $(DEPDIR)/pager_swig-generate-lock; do \ + sleep 1; \ + done; \ +## +## Succeed if and only if the first process succeeded; exit this +## process returning the status of the generated stamp. +## + test -f $(DEPDIR)/pager_swig-generate-stamp; \ + exit $$?; \ + fi; + +$(DEPDIR)/pager_swig-generate-stamp: +## This rule will be called only by the first process issuing the +## above rule to succeed in creating the lock directory, after +## removing the actual stamp file in order to guarantee that MAKE will +## execute this rule. +## +## Call SWIG to generate the various output files; special +## post-processing on 'mingw32' host OS for the dependency file. +## + if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \ + -MD -MF $(DEPDIR)/pager_swig.Std \ + -module pager_swig -o pager_swig.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/pager_swig.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \ + > $(DEPDIR)/pager_swig.Sd; \ + $(RM) $(DEPDIR)/pager_swig.Std; \ + $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \ + fi; +## +## Mess with the SWIG output .Std dependency file, to create a +## dependecy file valid for the input .i file: Basically, simulate the +## dependency file created for libraries by GNU's libtool for C++, +## where all of the dependencies for the target are first listed, then +## each individual dependency is listed as a target with no further +## dependencies. +## +## (1) remove the current dependency file +## + $(RM) $(DEPDIR)/pager_swig.d +## +## (2) Copy the whole SWIG file: +## + cp $(DEPDIR)/pager_swig.Std $(DEPDIR)/pager_swig.d +## +## (3) all a carriage return to the end of the dependency file. +## + echo "" >> $(DEPDIR)/pager_swig.d +## +## (4) from the SWIG file, remove the first line (the target); remove +## trailing " \" and " " from each line. Append ":" to each line, +## followed by 2 carriage returns, then append this to the end of +## the dependency file. +## + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig.d +## +## (5) remove the SWIG-generated file +## + $(RM) $(DEPDIR)/pager_swig.Std +## +## Create the stamp for this filename generation, to signal success in +## executing this rule; allows other threads waiting on this process +## to continue. +## + touch $(DEPDIR)/pager_swig-generate-stamp + +# KLUDGE: Force runtime include of a SWIG dependency file. This is +# not guaranteed to be portable, but will probably work. If it works, +# we have accurate dependencies for our swig stuff, which is good. + +@am__include@ @am__quote@./$(DEPDIR)/pager_swig.d@am__quote@ + diff --git a/gr-pager/swig/pager_flex_deinterleave.i b/gr-pager/swig/pager_flex_deinterleave.i new file mode 100644 index 000000000..f34951a8a --- /dev/null +++ b/gr-pager/swig/pager_flex_deinterleave.i @@ -0,0 +1,11 @@ +GR_SWIG_BLOCK_MAGIC(pager,flex_deinterleave); + +pager_flex_deinterleave_sptr pager_make_flex_deinterleave(); + +class pager_flex_deinterleave : public gr_sync_decimator +{ +private: + pager_flex_deinterleave(); + +public: +}; diff --git a/gr-pager/src/pager_flex_frame.i b/gr-pager/swig/pager_flex_frame.i index d754f5f79..d754f5f79 100644 --- a/gr-pager/src/pager_flex_frame.i +++ b/gr-pager/swig/pager_flex_frame.i diff --git a/gr-pager/swig/pager_flex_parse.i b/gr-pager/swig/pager_flex_parse.i new file mode 100644 index 000000000..21e0245cb --- /dev/null +++ b/gr-pager/swig/pager_flex_parse.i @@ -0,0 +1,11 @@ +GR_SWIG_BLOCK_MAGIC(pager,flex_parse); + +pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq); + +class pager_flex_parse : public gr_block +{ +private: + pager_flex_parse(gr_msg_queue_sptr queue, float freq); + +public: +}; diff --git a/gr-pager/swig/pager_flex_sync.i b/gr-pager/swig/pager_flex_sync.i new file mode 100644 index 000000000..49823db06 --- /dev/null +++ b/gr-pager/swig/pager_flex_sync.i @@ -0,0 +1,11 @@ +GR_SWIG_BLOCK_MAGIC(pager,flex_sync); + +pager_flex_sync_sptr pager_make_flex_sync(); + +class pager_flex_sync : public gr_block +{ +private: + pager_flex_sync(); + +public: +}; diff --git a/gr-pager/swig/pager_slicer_fb.i b/gr-pager/swig/pager_slicer_fb.i new file mode 100644 index 000000000..4ffb5b73b --- /dev/null +++ b/gr-pager/swig/pager_slicer_fb.i @@ -0,0 +1,12 @@ +GR_SWIG_BLOCK_MAGIC(pager,slicer_fb); + +pager_slicer_fb_sptr pager_make_slicer_fb(float alpha); + +class pager_slicer_fb : public gr_sync_block +{ +private: + pager_slicer_fb(float alpha); + +public: + float dc_offset() const { return d_avg; } +}; diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i new file mode 100644 index 000000000..66d6de7d8 --- /dev/null +++ b/gr-pager/swig/pager_swig.i @@ -0,0 +1,36 @@ +/* + * Copyright 2005,2006,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. + */ + +%include "gnuradio.i" + +%{ +#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 "pager_flex_frame.i" +%include "pager_slicer_fb.i" +%include "pager_flex_sync.i" +%include "pager_flex_deinterleave.i" +%include "pager_flex_parse.i" diff --git a/run_tests.sh.in b/run_tests.sh.in index 69fbe26dc..7e1ab9387 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -14,7 +14,7 @@ abs_top_builddir=@abs_top_builddir@ export srcdir=$3 # Where to find my swig generated shared library -mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs +mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/swig:$2/swig/.libs # Where to find my swig generated python module mysrcdir=$1/src:$1/src/lib |