[Commit-gnuradio] r6343 - in gnuradio/branches/developers/jcorgan/t162: config gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/blks2 gnuradio-core/src/python/gnuradio/blks2impl

[jcorgan]

Author: jcorgan
Date: 2007-09-06 12:59:56 -0600 (Thu, 06 Sep 2007)
New Revision: 6343

Added:
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/
Removed:
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blksimpl2/
Modified:
   gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_core.m4
   gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/Makefile.am
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2/__init__.py
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
Log:
Cloned blks directory to create blks2

Modified: gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_core.m4       
2007-09-06 16:35:40 UTC (rev 6342)
+++ gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_core.m4       
2007-09-06 18:59:56 UTC (rev 6343)
@@ -46,7 +46,7 @@
         gnuradio-core/src/python/gnuradio/blks/Makefile \
         gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
         gnuradio-core/src/python/gnuradio/blks2/Makefile \
-        gnuradio-core/src/python/gnuradio/blksimpl2/Makefile \
+        gnuradio-core/src/python/gnuradio/blks2impl/Makefile \
         gnuradio-core/src/python/gnuradio/gr/Makefile \
         gnuradio-core/src/python/gnuradio/gr/run_tests \
         gnuradio-core/src/python/gnuradio/gru/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4   
2007-09-06 16:35:40 UTC (rev 6342)
+++ gnuradio/branches/developers/jcorgan/t162/config/grc_gnuradio_examples.m4   
2007-09-06 18:59:56 UTC (rev 6343)
@@ -31,7 +31,6 @@
         gnuradio-examples/python/digital/Makefile \
         gnuradio-examples/python/digital_voice/Makefile \
        gnuradio-examples/python/hier/Makefile \
-       gnuradio-examples/python/hier/audio/Makefile \
        gnuradio-examples/python/hier/networking/Makefile \
        gnuradio-examples/python/hier/digital/Makefile \
        gnuradio-examples/python/hier/dect/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/Makefile.am
     2007-09-06 16:35:40 UTC (rev 6342)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/Makefile.am
     2007-09-06 18:59:56 UTC (rev 6343)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = gr gru gruimpl blks blksimpl blks2 blksimpl2 vocoder
+SUBDIRS = gr gru gruimpl blks blksimpl blks2 blks2impl vocoder
 
 grpython_PYTHON =                      \
        __init__.py                     \

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2/__init__.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2/__init__.py
       2007-09-06 16:35:40 UTC (rev 6342)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2/__init__.py
       2007-09-06 18:59:56 UTC (rev 6343)
@@ -27,11 +27,11 @@
 # to manually update this file.
 
 for p in __path__:
-    filenames = glob.glob (os.path.join (p, "..", "blksimpl2", "*.py"))
+    filenames = glob.glob (os.path.join (p, "..", "blks2impl", "*.py"))
     for f in filenames:
         f = os.path.basename(f).lower()
         f = f[:-3]
         if f == '__init__':
             continue
         # print f
-        exec "from gnuradio.blksimpl2.%s import *" % (f,)
+        exec "from gnuradio.blks2impl.%s import *" % (f,)

Copied: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl
 (from rev 6342, 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blksimpl)

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.am
    2007-09-06 16:35:40 UTC (rev 6342)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   2007-09-06 18:59:56 UTC (rev 6343)
@@ -24,7 +24,7 @@
 # EXTRA_DIST = run_tests.in
 # TESTS = run_tests
 
-grblkspythondir = $(grpythondir)/blksimpl
+grblkspythondir = $(grpythondir)/blks2impl
 
 grblkspython_PYTHON =          \
        __init__.py             \