[Commit-gnuradio] r11420 - in gnuradio/trunk/grc: . python scripts

[jblum]

Author: jblum
Date: 2009-07-11 16:10:25 -0600 (Sat, 11 Jul 2009)
New Revision: 11420

Added:
   gnuradio/trunk/grc/__init__.py
Removed:
   gnuradio/trunk/grc/__init__.py.in
Modified:
   gnuradio/trunk/grc/
   gnuradio/trunk/grc/Makefile.am
   gnuradio/trunk/grc/python/Platform.py
   gnuradio/trunk/grc/scripts/grc
Log:
make use of gr.version()


Property changes on: gnuradio/trunk/grc
___________________________________________________________________
Modified: svn:ignore
   - grc.conf
__init__.py
Makefile
Makefile.in

   + grc.conf
Makefile
Makefile.in


Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am      2009-07-11 17:52:31 UTC (rev 11419)
+++ gnuradio/trunk/grc/Makefile.am      2009-07-11 22:10:25 UTC (rev 11420)
@@ -42,19 +42,10 @@
 etcdir = $(gr_prefsdir)
 dist_etc_DATA = grc.conf
 
-EXTRA_DIST = \
-       $(srcdir)/__init__.py.in \
-       $(srcdir)/grc.conf.in
+EXTRA_DIST = $(srcdir)/grc.conf.in
 
-BUILT_SOURCES = \
-       __init__.py \
-       grc.conf
+BUILT_SOURCES = grc.conf
 
-__init__.py: $(srcdir)/__init__.py.in Makefile
-       sed \
-               -e 's|@address@hidden|$(VERSION)|g' \
-       $< > $@
-
 grc.conf: $(srcdir)/grc.conf.in Makefile
        sed \
                -e 's|@address@hidden|$(PYTHONW)|g' \

Modified: gnuradio/trunk/grc/python/Platform.py
===================================================================
--- gnuradio/trunk/grc/python/Platform.py       2009-07-11 17:52:31 UTC (rev 
11419)
+++ gnuradio/trunk/grc/python/Platform.py       2009-07-11 22:10:25 UTC (rev 
11420)
@@ -18,7 +18,7 @@
 """
 
 import os
-from .. import VERSION #TEMP: until gnuradio has __version__
+from gnuradio import gr
 from .. base.Platform import Platform as _Platform
 from FlowGraph import FlowGraph as _FlowGraph
 from Connection import Connection as _Connection
@@ -59,7 +59,7 @@
                _Platform.__init__(
                        self,
                        name='GNU Radio Companion',
-                       version=VERSION,
+                       version=gr.version(),
                        key='grc',
                        license=__doc__.strip(),
                        
website='http://gnuradio.org/trac/wiki/GNURadioCompanion',

Modified: gnuradio/trunk/grc/scripts/grc
===================================================================
--- gnuradio/trunk/grc/scripts/grc      2009-07-11 17:52:31 UTC (rev 11419)
+++ gnuradio/trunk/grc/scripts/grc      2009-07-11 22:10:25 UTC (rev 11420)
@@ -30,7 +30,7 @@
        d.run()
        exit(-1)
 
-from gnuradio.grc import VERSION
+from gnuradio import gr
 from optparse import OptionParser
 
 if __name__ == "__main__":
@@ -42,7 +42,7 @@
 GRC comes with ABSOLUTELY NO WARRANTY.
 This is free software,
 and you are welcome to redistribute it.
-"""%VERSION
+"""%gr.version()
        parser = OptionParser(usage=usage, version=version)
        (options, args) = parser.parse_args()
        from gnuradio.grc.python.Platform import Platform