[Commit-gnuradio] [gnuradio] 23/43: grc: make use of GRC_HIER_PATH at runtime

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 15417bdd699beef1905dd94b66ac39444b96d70d
Author: Sebastian Koslowski <address@hidden>
Date:   Thu Feb 12 10:05:21 2015 +0100

    grc: make use of GRC_HIER_PATH at runtime
---
 grc/python/Generator.py    | 6 +++---
 grc/python/flow_graph.tmpl | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 7512cfb..a263679 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -219,8 +219,8 @@ class HierBlockGenerator(TopBlockGenerator):
         """
         TopBlockGenerator.__init__(self, flow_graph, file_path)
         self._mode = HIER_BLOCK_FILE_MODE
-        self._file_path = os.path.join(HIER_BLOCKS_LIB_DIR,
-                                       self._flow_graph.get_option('id') + 
'.py')
+        self._file_name = self._flow_graph.get_option('id') + '.py'
+        self._file_path = os.path.join(HIER_BLOCKS_LIB_DIR, self._file_name)
         self._file_path_xml = self._file_path + '.xml'
 
     def get_file_path_xml(self):
@@ -254,7 +254,7 @@ class HierBlockGenerator(TopBlockGenerator):
             self._flow_graph.get_option('id').replace('_', ' ').title()
         block_n['key'] = block_key
         block_n['category'] = self._flow_graph.get_option('category')
-        block_n['import'] = 'execfile("{0}")'.format(self.get_file_path())
+        block_n['import'] = 'execfile(os.path.join(GRC_HIER_PATH, ' + 
repr(self._file_name) + '))'
         # make data
         if parameters:
             block_n['make'] = '{cls}(\n    {kwargs},\n)'.format(
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 859611e..a0de5d1 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -19,7 +19,7 @@ $code#slurp
 #import time
 #set $DIVIDER = '#'*50
 $DIVIDER
-# Gnuradio Python Flow Graph
+# GNU Radio Python Flow Graph
 # Title: $title
 #if $flow_graph.get_option('author')
 # Author: $flow_graph.get_option('author')
@@ -48,6 +48,11 @@ if __name__ == '__main__':
 ########################################################
 ##Create Imports
 ########################################################
+#if any("GRC_HIER_PATH" in imp for imp in $imports)
+import os
+GRC_HIER_PATH = os.environ.get('GRC_HIER_PATH', 
os.path.expanduser('~/.grc_gnuradio'))
+
+#end if
 #for $imp in $imports
 $imp
 #end for