diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:32:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:32:10 -0700 |
| commit | 1c122cbb5cdb1a979fc60e81646a39cbe7b89adf (patch) | |
| tree | f6d110453a3f00a07cf85b1e65dcc672b7f961ab /gr-utils/python/utils | |
| parent | e55666b75c055afe26145a090acd894e9c1d47b0 (diff) | |
| parent | 3e1a92f1643dff8eb53e2ae2c72e592be40a863c (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-utils/python/utils')
| -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 82db5435db..b9bd1551b9 100755 --- a/gr-utils/python/utils/grcc +++ b/gr-utils/python/utils/grcc @@ -26,16 +26,22 @@ from optparse import OptionParser 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): |