diff options
author | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:15:56 +0200 |
---|---|---|
committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:18:29 +0200 |
commit | 8e2886dc6b45b4e3f68d84887f728483fd2d1538 (patch) | |
tree | e682bbea9e329c80ebc66233d58a01a1306bddbd /gr-utils/python/utils/grcc | |
parent | cbe1e43b0f0d1ee0d356b7110700400578855ac6 (diff) | |
parent | fc1a6a88483120921936e415aba4d5d1a9b42d96 (diff) |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-utils/python/utils/grcc')
-rwxr-xr-x | gr-utils/python/utils/grcc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gr-utils/python/utils/grcc b/gr-utils/python/utils/grcc index 776af799d3..e93802f051 100755 --- a/gr-utils/python/utils/grcc +++ b/gr-utils/python/utils/grcc @@ -26,16 +26,22 @@ from argparse import ArgumentParser import warnings warnings.simplefilter('ignore') +from gnuradio import gr + try: - from grc.python.Platform import Platform + from grc.core.Platform import Platform except ImportError: - from gnuradio.grc.python.Platform import Platform + from gnuradio.grc.core.Platform import Platform class GRCC: def __init__(self, grcfile, out_dir): self.out_dir = out_dir - self.platform = Platform() + self.platform = Platform( + prefs_file=gr.prefs(), + version=gr.version(), + version_parts=(gr.major_version(), gr.api_version(), gr.minor_version()) + ) data = self.platform.parse_flow_graph(grcfile) self.fg = self.platform.get_new_flow_graph() @@ -48,7 +54,7 @@ class GRCC: ["Validation failed:"] + self.fg.get_error_messages() )) - self.gen = self.platform.get_generator()(self.fg, out_dir) + self.gen = self.platform.Generator(self.fg, out_dir) self.gen.write() def exec_program(self): |