summaryrefslogtreecommitdiff
path: root/grc/scripts
diff options
context:
space:
mode:
authorjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2009-05-29 06:43:35 +0000
committerjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2009-05-29 06:43:35 +0000
commit693cf2facf18c95db1559b035b09137f0fc191e6 (patch)
tree7358d2beb562e32fb65bbe96185f79eac62c95bd /grc/scripts
parentefc3d118fe6e2386da9cf3d8a4a09df0efa749b1 (diff)
Did a little work with path handling.
Additional blocks paths can be specified with environment variable GRC_BLOCKS_PATH git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11163 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/scripts')
-rwxr-xr-xgrc/scripts/grc7
-rwxr-xr-xgrc/scripts/usrp2_probe2
-rwxr-xr-xgrc/scripts/usrp_probe2
3 files changed, 8 insertions, 3 deletions
diff --git a/grc/scripts/grc b/grc/scripts/grc
index d0b8099f1b..a2e3bc28ac 100755
--- a/grc/scripts/grc
+++ b/grc/scripts/grc
@@ -18,6 +18,8 @@ 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
@@ -50,5 +52,8 @@ and you are welcome to redistribute it.
#setup icon using icon theme
try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
except: pass
- ActionHandler(args, Platform())
+ #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))
diff --git a/grc/scripts/usrp2_probe b/grc/scripts/usrp2_probe
index baf44a4794..fac2427de0 100755
--- a/grc/scripts/usrp2_probe
+++ b/grc/scripts/usrp2_probe
@@ -30,7 +30,7 @@ import gobject
from gnuradio.grc.gui.Dialogs import TextDisplay
from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp2_probe.xml'])
+platform = Platform(critical_only=True)
from gnuradio.grc.platforms.gui.Platform import Platform
platform = Platform(platform)
diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe
index 3d7b6f0cbb..3eb3de58ed 100755
--- a/grc/scripts/usrp_probe
+++ b/grc/scripts/usrp_probe
@@ -28,7 +28,7 @@ import gtk
from gnuradio.grc.gui.Dialogs import TextDisplay
from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp_probe.xml'])
+platform = Platform(critical_only=True)
from gnuradio.grc.platforms.gui.Platform import Platform
platform = Platform(platform)