Merge utils from http://gnuradio.org/git/trondeau.git

[debian/gnuradio] / grc / scripts / grc

diff --git a/grc/scripts/grc b/grc/scripts/grc
index a2e3bc28ace73b141279cd45150959e475e2b5b0..a4115c39f367d7785d6ecd991d92d74bff0e864a 100755 (executable)
--- a/grc/scripts/grc
+++ b/grc/scripts/grc
@@ -18,8 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import os
-
 import pygtk
 pygtk.require('2.0')
 import gtk
@@ -32,7 +30,7 @@ Cannot import gnuradio. Are your PYTHONPATH and LD_LIBRARY_PATH set correctly?""
        d.run()
        exit(-1)
 
-from gnuradio.grc.platforms.base.Constants import VERSION
+from gnuradio import gr
 from optparse import OptionParser
 
 if __name__ == "__main__":
@@ -44,16 +42,13 @@ This program is part of GNU Radio
 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.platforms.python.Platform import Platform
+       from gnuradio.grc.python.Platform import Platform
        from gnuradio.grc.gui.ActionHandler import ActionHandler
        #setup icon using icon theme
        try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
        except: pass
-       #extract extra block paths from environment variable, separated by semicolon
-       try: extra_blocks = os.environ['GRC_BLOCKS_PATH'].split(';')
-       except: extra_blocks = list()
-       ActionHandler(args, Platform(extra_blocks=extra_blocks))
+       ActionHandler(args, Platform())