From 70dd1dc6610135a1967de554189be38af8f3b080 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 11:20:09 -0700 Subject: rename s/gnuradio_swig_python/gnuradio_core/g --- gnuradio-core/src/lib/swig/Makefile.am | 4 ++-- gnuradio-core/src/lib/swig/gnuradio_core.py | 28 ++++++++++++++++++++++ gnuradio-core/src/lib/swig/gnuradio_swig.scm | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_python.py | 28 ---------------------- gnuradio-core/src/python/gnuradio/gr/__init__.py | 4 ++-- .../src/python/gnuradio/gr/hier_block2.py | 2 +- gnuradio-core/src/python/gnuradio/gr/prefs.py | 2 +- gnuradio-core/src/python/gnuradio/gr/scheduler.py | 2 +- gnuradio-core/src/python/gnuradio/gr/top_block.py | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core.py delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_python.py (limited to 'gnuradio-core/src') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index f354efe0b..9e0d2f69e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -29,7 +29,7 @@ CLEANFILES += guile/gnuradio* endif # ---------------------------------------------------------------- -# We've split the previously monstrous gnuradio_swig_python into 6 +# We've split the previously monstrous gnuradio_core into 6 # smaller pieces. This reduces compile time coupling and creates # smaller pieces for the compiler to digest. prior to this change, on # X86_64, g++'s resident set size was 650MB! @@ -68,7 +68,7 @@ EXTRA_DIST = gen-swig-bug-fix # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +ourpython_PYTHON = gnuradio_core.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.py b/gnuradio-core/src/lib/swig/gnuradio_core.py new file mode 100644 index 000000000..172051013 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core.py @@ -0,0 +1,28 @@ +# +# Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +# This file implements the old gnuradio_core namespace + +from gnuradio_core_runtime import * +from gnuradio_core_general import * +from gnuradio_core_gengen import * +from gnuradio_core_filter import * +from gnuradio_core_io import * +from gnuradio_core_hier import * diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig.scm b/gnuradio-core/src/lib/swig/gnuradio_swig.scm index 961564d68..c07d46a64 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig.scm @@ -3,7 +3,7 @@ ;;; We'll need to assemble the (gnuradio gr) module somewhere... ;;; -;; # This file implements the old gnuradio_swig_python namespace +;; # This file implements the old gnuradio_core namespace ;; ;; from gnuradio_swig_py_runtime import * ;; from gnuradio_swig_py_general import * diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py deleted file mode 100644 index 8f9fffd5c..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -# This file implements the old gnuradio_swig_python namespace - -from gnuradio_core_runtime import * -from gnuradio_core_general import * -from gnuradio_core_gengen import * -from gnuradio_core_filter import * -from gnuradio_core_io import * -from gnuradio_core_hier import * diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py index 6f939c470..73ca8e08f 100644 --- a/gnuradio-core/src/python/gnuradio/gr/__init__.py +++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py @@ -1,5 +1,5 @@ # -# Copyright 2003,2004,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2003,2004,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -40,7 +40,7 @@ if _RTLD_GLOBAL != 0: _dlopenflags = sys.getdlopenflags() sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL) -from gnuradio_swig_python import * +from gnuradio_core import * from exceptions import * from hier_block2 import * from top_block import * diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py index b43c5feda..f2256da1b 100644 --- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py +++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio_swig_python import hier_block2_swig +from gnuradio_core import hier_block2_swig # # This hack forces a 'has-a' relationship to look like an 'is-a' one. diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-core/src/python/gnuradio/gr/prefs.py index 9b31b772b..40347a2f4 100644 --- a/gnuradio-core/src/python/gnuradio/gr/prefs.py +++ b/gnuradio-core/src/python/gnuradio/gr/prefs.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -import gnuradio_swig_python as gsp +import gnuradio_core as gsp _prefs_base = gsp.gr_prefs diff --git a/gnuradio-core/src/python/gnuradio/gr/scheduler.py b/gnuradio-core/src/python/gnuradio/gr/scheduler.py index 4694d48b2..67f79ab77 100644 --- a/gnuradio-core/src/python/gnuradio/gr/scheduler.py +++ b/gnuradio-core/src/python/gnuradio/gr/scheduler.py @@ -20,7 +20,7 @@ # from gnuradio.gr.exceptions import * -from gnuradio_swig_python import single_threaded_scheduler, sts_pyrun +from gnuradio_core import single_threaded_scheduler, sts_pyrun import gr_threading as _threading #import threading as _threading diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-core/src/python/gnuradio/gr/top_block.py index 71e401424..59bb0438f 100644 --- a/gnuradio-core/src/python/gnuradio/gr/top_block.py +++ b/gnuradio-core/src/python/gnuradio/gr/top_block.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio_swig_python import top_block_swig, \ +from gnuradio_core import top_block_swig, \ top_block_wait_unlocked, top_block_run_unlocked #import gnuradio.gr.gr_threading as _threading -- cgit