diff options
| author | Anders Kalør <anders@kaloer.com> | 2019-08-10 18:20:32 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2019-12-04 12:10:33 -0500 |
| commit | df14dfd1f12605ae5dcf3a395059e255a7fcd73f (patch) | |
| tree | bbb0b66313145f9ff6ff0f162a4bb6d3787af802 /gr-utils/python/modtool/core/rm.py | |
| parent | 6be01747e08f5446f4c69b5a3e41f33cc372630e (diff) | |
modtool: use Boost UTF for 3.8 OOT blocks
modtool was adding CppUnit qa code for gnuradio 3.8. Boost UTF support
was already implemented in #2080, but for some reason not in add.py.
This commit adds the code from #2080, adapted to the new modtool.
Note that it is based on #2592. Fixes #2722, fixes #2697.
Diffstat (limited to 'gr-utils/python/modtool/core/rm.py')
| -rw-r--r-- | gr-utils/python/modtool/core/rm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-utils/python/modtool/core/rm.py b/gr-utils/python/modtool/core/rm.py index 390dbd0ed6..227a69835d 100644 --- a/gr-utils/python/modtool/core/rm.py +++ b/gr-utils/python/modtool/core/rm.py @@ -1,5 +1,5 @@ # -# Copyright 2013, 2018 Free Software Foundation, Inc. +# Copyright 2013, 2018, 2019 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -78,12 +78,12 @@ class ModToolRemove(ModTool): r'\$\{CMAKE_CURRENT_SOURCE_DIR\}/%s' % filename, to_ignore_start='APPEND test_{}_sources'.format(self.info['modname'])) self.scm.mark_file_updated(ed.filename) - elif self._info['version'] == '38': + elif self.info['version'] == '38': (base, ext) = os.path.splitext(filename) if ext == '.cc': ed.remove_value( 'list', filename, - to_ignore_start='APPEND test_%s_sources' % self._info['modname']) + to_ignore_start='APPEND test_{}_sources'.format(self.info['modname'])) self.scm.mark_file_updated(ed.filename) else: filebase = os.path.splitext(filename)[0] |