[Commit-gnuradio] r11187 - in gnuradio/branches/developers/jblum/grc: config grc grc/grc_gnuradio grc/grc_gnuradio/blks2 grc/grc_gnuradio/usrp grc/grc_gnuradio/wxgui grc/src

[jblum]

Author: jblum
Date: 2009-06-13 17:35:53 -0600 (Sat, 13 Jun 2009)
New Revision: 11187

Added:
   gnuradio/branches/developers/jblum/grc/grc/base/
   gnuradio/branches/developers/jblum/grc/grc/cpp/
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/README
   gnuradio/branches/developers/jblum/grc/grc/gui/
   gnuradio/branches/developers/jblum/grc/grc/python/
Removed:
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/blks2/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/usrp/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/wxgui/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/
Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
   gnuradio/branches/developers/jblum/grc/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/Makefile.inc
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/blks2/
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/usrp/
   gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/wxgui/
   gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am
Log:
Moved supplemental grc_gnuradio module, added readme.



Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2009-06-13 
22:36:53 UTC (rev 11186)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2009-06-13 
23:35:53 UTC (rev 11187)
@@ -47,10 +47,7 @@
     AC_SUBST(PYTHONW)
 
     AC_CONFIG_FILES([ \
-        grc/src/grc_gnuradio/Makefile \
-        grc/src/grc_gnuradio/wxgui/Makefile \
-        grc/src/grc_gnuradio/blks2/Makefile \
-        grc/src/grc_gnuradio/usrp/Makefile \
+        grc/grc_gnuradio/Makefile \
         grc/src/Makefile \
         grc/src/platforms/Makefile \
         grc/src/platforms/base/Makefile \

Modified: gnuradio/branches/developers/jblum/grc/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2009-06-13 
22:36:53 UTC (rev 11186)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2009-06-13 
23:35:53 UTC (rev 11187)
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -26,7 +26,8 @@
        data \
        examples \
        scripts \
-       src
+       src \
+       grc_gnuradio
 
 ## append freedesktop to the list of subdirs when xdg utils are present
 if XDG_UTILS

Modified: gnuradio/branches/developers/jblum/grc/grc/Makefile.inc
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.inc     2009-06-13 
22:36:53 UTC (rev 11186)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.inc     2009-06-13 
23:35:53 UTC (rev 11187)
@@ -20,7 +20,6 @@
 #
 
 include $(top_srcdir)/Makefile.common
-grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
 grc_src_prefix = $(pythondir)/gnuradio/grc
 grc_base_data_reldir = grc/base
 grc_python_data_reldir = grc/python


Property changes on: gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
Constants.py

Added: svn:mergeinfo
   + /gnuradio/branches/developers/eb/t348/grc/src/grc_gnuradio:10638-10648
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio:10958-10971
/gnuradio/branches/developers/eb/t378/grc/src/grc_gnuradio:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/src/grc_gnuradio:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/src/grc_gnuradio:10667-10677
/gnuradio/branches/developers/jblum/wxgui/grc/src/grc_gnuradio:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/grc/src/grc_gnuradio:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/src/grc_gnuradio:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/src/grc_gnuradio:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/src/grc_gnuradio:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/src/grc_gnuradio:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/src/grc_gnuradio:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/src/grc_gnuradio:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/src/grc_gnuradio:10540-10546

Modified: gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2009-06-13 22:36:53 UTC (rev 11186)
+++ gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/Makefile.am 
2009-06-13 23:35:53 UTC (rev 11187)
@@ -19,13 +19,31 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
 
-SUBDIRS = \
-       blks2 \
-       usrp \
-       wxgui
+grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
 
-ourpythondir = $(grc_gnuradio_prefix)
+rootpythondir = $(grc_gnuradio_prefix)
+rootpython_PYTHON = __init__.py
 
-ourpython_PYTHON = __init__.py
+blks2pythondir = $(grc_gnuradio_prefix)/blks2
+blks2python_PYTHON = \
+       blks2/__init__.py \
+       blks2/error_rate.py \
+       blks2/packet.py \
+       blks2/probe.py \
+       blks2/selector.py \
+       blks2/tcp.py \
+       blks2/variable_sink.py
+
+usrppythondir = $(grc_gnuradio_prefix)/usrp
+usrppython_PYTHON = \
+       usrp/__init__.py \
+       usrp/common.py \
+       usrp/dual_usrp.py \
+       usrp/simple_usrp.py
+
+wxguipythondir = $(grc_gnuradio_prefix)/wxgui
+wxguipython_PYTHON = \
+       wxgui/__init__.py \
+       wxgui/top_block_gui.py

Added: gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/README
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/README              
                (rev 0)
+++ gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/README      
2009-06-13 23:35:53 UTC (rev 11187)
@@ -0,0 +1,14 @@
+This is the grc_gnuradio module.
+It contains supplemental python modules that grc uses at runtime.
+The supplemental modules are meant to mimic modules in gnuradio.
+These will be phased-out as new functionaility is merged into gnuradio.
+
+The blk2s module wraps many blocks in blks2 and gives them streaming outputs.
+Will be phased-out by new message passing implementations.
+Other blks2 blocks will hopefully make their way into blks2impl.
+
+The usrp module contains the simple and dual usrp wrappers.
+Will be phased-out by generic usrp and/or new usrp api.
+
+The wxgui module contains a top_block + wxgui frame.
+Will be phased-out by gui.py in wxgui and a new top block template.


Property changes on: 
gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/blks2
___________________________________________________________________
Deleted: svn:ignore
   - Makefile
Makefile.in



Property changes on: 
gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/usrp
___________________________________________________________________
Deleted: svn:ignore
   - Makefile
Makefile.in



Property changes on: 
gnuradio/branches/developers/jblum/grc/grc/grc_gnuradio/wxgui
___________________________________________________________________
Deleted: svn:ignore
   - Makefile
Makefile.in


Modified: gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am  2009-06-13 
22:36:53 UTC (rev 11186)
+++ gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am  2009-06-13 
23:35:53 UTC (rev 11187)
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,7 +23,6 @@
 
 SUBDIRS = \
        platforms \
-       grc_gnuradio \
        gui \
        utils