From a62f90d8cc96b9dea9289ad6e420d1c0b16f6c36 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Thu, 24 Jan 2013 19:33:03 +0100
Subject: utils: added modtool
---
gr-utils/src/python/modtool/cmakefile_editor.py | 97 +++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 gr-utils/src/python/modtool/cmakefile_editor.py
(limited to 'gr-utils/src/python/modtool/cmakefile_editor.py')
diff --git a/gr-utils/src/python/modtool/cmakefile_editor.py b/gr-utils/src/python/modtool/cmakefile_editor.py
new file mode 100644
index 0000000000..fe50373bb8
--- /dev/null
+++ b/gr-utils/src/python/modtool/cmakefile_editor.py
@@ -0,0 +1,97 @@
+""" Edit CMakeLists.txt files """
+
+import re
+
+### CMakeFile.txt editor class ###############################################
+class CMakeFileEditor(object):
+ """A tool for editing CMakeLists.txt files. """
+ def __init__(self, filename, separator=' ', indent=' '):
+ self.filename = filename
+ self.cfile = open(filename, 'r').read()
+ self.separator = separator
+ self.indent = indent
+
+ def get_entry_value(self, entry, to_ignore=''):
+ """ Get the value of an entry.
+ to_ignore is the part of the entry you don't care about. """
+ regexp = '%s\(%s([^()]+)\)' % (entry, to_ignore)
+ mobj = re.search(regexp, self.cfile, flags=re.MULTILINE)
+ if mobj is None:
+ return None
+ value = mobj.groups()[0].strip()
+ return value
+
+ def append_value(self, entry, value, to_ignore=''):
+ """ Add a value to an entry. """
+ regexp = re.compile('(%s\([^()]*?)\s*?(\s?%s)\)' % (entry, to_ignore),
+ re.MULTILINE)
+ substi = r'\1' + self.separator + value + r'\2)'
+ self.cfile = regexp.sub(substi, self.cfile, count=1)
+
+ def remove_value(self, entry, value, to_ignore=''):
+ """Remove a value from an entry."""
+ regexp = '^\s*(%s\(\s*%s[^()]*?\s*)%s\s*([^()]*\))' % (entry, to_ignore, value)
+ regexp = re.compile(regexp, re.MULTILINE)
+ self.cfile = re.sub(regexp, r'\1\2', self.cfile, count=1)
+
+ def delete_entry(self, entry, value_pattern=''):
+ """Remove an entry from the current buffer."""
+ regexp = '%s\s*\([^()]*%s[^()]*\)[^\n]*\n' % (entry, value_pattern)
+ regexp = re.compile(regexp, re.MULTILINE)
+ self.cfile = re.sub(regexp, '', self.cfile, count=1)
+
+ def write(self):
+ """ Write the changes back to the file. """
+ open(self.filename, 'w').write(self.cfile)
+
+ def remove_double_newlines(self):
+ """Simply clear double newlines from the file buffer."""
+ self.cfile = re.compile('\n\n\n+', re.MULTILINE).sub('\n\n', self.cfile)
+
+ def find_filenames_match(self, regex):
+ """ Find the filenames that match a certain regex
+ on lines that aren't comments """
+ filenames = []
+ reg = re.compile(regex)
+ fname_re = re.compile('[a-zA-Z]\w+\.\w{1,5}$')
+ for line in self.cfile.splitlines():
+ if len(line.strip()) == 0 or line.strip()[0] == '#':
+ continue
+ for word in re.split('[ /)(\t\n\r\f\v]', line):
+ if fname_re.match(word) and reg.search(word):
+ filenames.append(word)
+ return filenames
+
+ def disable_file(self, fname):
+ """ Comment out a file """
+ starts_line = False
+ for line in self.cfile.splitlines():
+ if len(line.strip()) == 0 or line.strip()[0] == '#':
+ continue
+ if re.search(r'\b'+fname+r'\b', line):
+ if re.match(fname, line.lstrip()):
+ starts_line = True
+ break
+ comment_out_re = r'#\1' + '\n' + self.indent
+ if not starts_line:
+ comment_out_re = r'\n' + self.indent + comment_out_re
+ (self.cfile, nsubs) = re.subn(r'(\b'+fname+r'\b)\s*', comment_out_re, self.cfile)
+ if nsubs == 0:
+ print "Warning: A replacement failed when commenting out %s. Check the CMakeFile.txt manually." % fname
+ elif nsubs > 1:
+ print "Warning: Replaced %s %d times (instead of once). Check the CMakeFile.txt manually." % (fname, nsubs)
+
+ def comment_out_lines(self, pattern, comment_str='#'):
+ """ Comments out all lines that match with pattern """
+ for line in self.cfile.splitlines():
+ if re.search(pattern, line):
+ self.cfile = self.cfile.replace(line, comment_str+line)
+
+ def check_for_glob(self, globstr):
+ """ Returns true if a glob as in globstr is found in the cmake file """
+ glob_re = r'GLOB\s[a-z_]+\s"%s"' % globstr.replace('*', '\*')
+ if re.search(glob_re, self.cfile, flags=re.MULTILINE|re.IGNORECASE) is not None:
+ return True
+ else:
+ return False
+
--
cgit v1.2.3
From c4971ab2cb4bdbb9abc5d5320bd16b45cf263cf8 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Fri, 25 Jan 2013 17:52:46 +0100
Subject: utils: modtool minor updates
---
gr-utils/src/python/modtool/cmakefile_editor.py | 2 +-
gr-utils/src/python/modtool/modtool_add.py | 2 +-
gr-utils/src/python/modtool/modtool_newmod.py | 2 +-
gr-utils/src/python/modtool/templates.py | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
(limited to 'gr-utils/src/python/modtool/cmakefile_editor.py')
diff --git a/gr-utils/src/python/modtool/cmakefile_editor.py b/gr-utils/src/python/modtool/cmakefile_editor.py
index fe50373bb8..b182757076 100644
--- a/gr-utils/src/python/modtool/cmakefile_editor.py
+++ b/gr-utils/src/python/modtool/cmakefile_editor.py
@@ -5,7 +5,7 @@ import re
### CMakeFile.txt editor class ###############################################
class CMakeFileEditor(object):
"""A tool for editing CMakeLists.txt files. """
- def __init__(self, filename, separator=' ', indent=' '):
+ def __init__(self, filename, separator='\n ', indent=' '):
self.filename = filename
self.cfile = open(filename, 'r').read()
self.separator = separator
diff --git a/gr-utils/src/python/modtool/modtool_add.py b/gr-utils/src/python/modtool/modtool_add.py
index c664d7c1a2..581f3b0aaf 100644
--- a/gr-utils/src/python/modtool/modtool_add.py
+++ b/gr-utils/src/python/modtool/modtool_add.py
@@ -272,7 +272,7 @@ class ModToolAdd(ModTool):
self._write_tpl('block_python', 'python', fname_py)
append_re_line_sequence(self._file['pyinit'],
'(^from.*import.*\n|# import any pure.*\n)',
- 'from %s import *' % self._info['blockname'])
+ 'from %s import %s' % (self._info['blockname'], self._info['blockname']))
if self.options.skip_cmakefiles:
return
ed = CMakeFileEditor(self._file['cmpython'])
diff --git a/gr-utils/src/python/modtool/modtool_newmod.py b/gr-utils/src/python/modtool/modtool_newmod.py
index 9b2dc6e30d..0c69cb69e8 100644
--- a/gr-utils/src/python/modtool/modtool_newmod.py
+++ b/gr-utils/src/python/modtool/modtool_newmod.py
@@ -51,7 +51,7 @@ class ModToolNewModule(ModTool):
* Open all files, rename howto and HOWTO to the module name
* Rename files and directories that contain the word howto
"""
- print "Creating out-of-tree module in %s..." % self._dir
+ print "Creating out-of-tree module in %s..." % self._dir,
try:
shutil.copytree('/home/braun/.usrlocal/share/gnuradio/modtool/gr-newmod', self._dir)
os.chdir(self._dir)
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py
index e3019bb701..f41049c5ae 100644
--- a/gr-utils/src/python/modtool/templates.py
+++ b/gr-utils/src/python/modtool/templates.py
@@ -287,8 +287,8 @@ import numpy
#set $deciminterp = ', <+interpolation+>'
#else if $blocktype == 'decimator'
#set $deciminterp = ', <+decimation+>'
-#set $deciminterp = ''
#else
+#set $deciminterp = ''
#end if
from gnuradio import gr
@@ -297,7 +297,7 @@ class ${blockname}(${parenttype}):
docstring for block ${blockname}
"""
def __init__(self#if $arglist == '' then '' else ', '#$arglist):
- gr.${parenttype}.__init__(self,
+ ${parenttype}.__init__(self,
#if $blocktype == 'hier'
"$blockname",
gr.io_signature(${inputsig}), # Input signature
@@ -324,8 +324,6 @@ class ${blockname}(${parenttype}):
\#self.consume_each(len(input_items[0]))
return len(output_items[0])
#stop
-#else
- def work(self, input_items, output_items):
#end if
def work(self, input_items, output_items):
--
cgit v1.2.3
From 9ef0f125355a4541c691f18d05ad7ca7b6f7125e Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Sun, 27 Jan 2013 16:57:04 +0100
Subject: modtool: added copyleft headers
---
gr-utils/src/python/modtool/__init__.py | 2 +-
gr-utils/src/python/modtool/cmakefile_editor.py | 21 ++++++++++-
gr-utils/src/python/modtool/code_generator.py | 21 ++++++++++-
gr-utils/src/python/modtool/grc_xml_generator.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_add.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_base.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_disable.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_help.py | 44 ++++++++++++------------
gr-utils/src/python/modtool/modtool_info.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_makexml.py | 21 ++++++++++-
gr-utils/src/python/modtool/modtool_newmod.py | 23 +++++++++++--
gr-utils/src/python/modtool/modtool_rm.py | 21 ++++++++++-
gr-utils/src/python/modtool/parser_cc_block.py | 21 ++++++++++-
gr-utils/src/python/modtool/templates.py | 22 ++++++++++--
gr-utils/src/python/modtool/util_functions.py | 21 ++++++++++-
15 files changed, 284 insertions(+), 38 deletions(-)
(limited to 'gr-utils/src/python/modtool/cmakefile_editor.py')
diff --git a/gr-utils/src/python/modtool/__init__.py b/gr-utils/src/python/modtool/__init__.py
index a107472540..7935e4b482 100644
--- a/gr-utils/src/python/modtool/__init__.py
+++ b/gr-utils/src/python/modtool/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/gr-utils/src/python/modtool/cmakefile_editor.py b/gr-utils/src/python/modtool/cmakefile_editor.py
index b182757076..ed5b714253 100644
--- a/gr-utils/src/python/modtool/cmakefile_editor.py
+++ b/gr-utils/src/python/modtool/cmakefile_editor.py
@@ -1,8 +1,27 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Edit CMakeLists.txt files """
import re
-### CMakeFile.txt editor class ###############################################
class CMakeFileEditor(object):
"""A tool for editing CMakeLists.txt files. """
def __init__(self, filename, separator='\n ', indent=' '):
diff --git a/gr-utils/src/python/modtool/code_generator.py b/gr-utils/src/python/modtool/code_generator.py
index b727f611e5..525b3d1e9a 100644
--- a/gr-utils/src/python/modtool/code_generator.py
+++ b/gr-utils/src/python/modtool/code_generator.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" A code generator (needed by ModToolAdd) """
from templates import Templates
@@ -7,7 +27,6 @@ from util_functions import str_to_python_comment
from util_functions import strip_default_values
from util_functions import strip_arg_types
-### Code generator class #####################################################
class GRMTemplate(Cheetah.Template.Template):
""" An extended template class """
def __init__(self, src, searchList):
diff --git a/gr-utils/src/python/modtool/grc_xml_generator.py b/gr-utils/src/python/modtool/grc_xml_generator.py
index 2fa61863f2..7ccd443196 100644
--- a/gr-utils/src/python/modtool/grc_xml_generator.py
+++ b/gr-utils/src/python/modtool/grc_xml_generator.py
@@ -1,7 +1,26 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
import xml.etree.ElementTree as ET
from util_functions import is_number, xml_indent
-### GRC XML Generator ########################################################
try:
import lxml.etree
LXML_IMPORTED = True
diff --git a/gr-utils/src/python/modtool/modtool_add.py b/gr-utils/src/python/modtool/modtool_add.py
index 581f3b0aaf..a6c84bea85 100644
--- a/gr-utils/src/python/modtool/modtool_add.py
+++ b/gr-utils/src/python/modtool/modtool_add.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Module to add new blocks """
import os
@@ -12,7 +32,6 @@ from templates import Templates
from code_generator import get_template
import Cheetah.Template
-### Add new block module #####################################################
class ModToolAdd(ModTool):
""" Add block to the out-of-tree module. """
name = 'add'
diff --git a/gr-utils/src/python/modtool/modtool_base.py b/gr-utils/src/python/modtool/modtool_base.py
index edb0f14eed..d824910e95 100644
--- a/gr-utils/src/python/modtool/modtool_base.py
+++ b/gr-utils/src/python/modtool/modtool_base.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Base class for the modules """
import os
@@ -8,7 +28,6 @@ from optparse import OptionParser, OptionGroup
from util_functions import get_modname
from templates import Templates
-### ModTool base class #######################################################
class ModTool(object):
""" Base class for all modtool command classes. """
def __init__(self):
diff --git a/gr-utils/src/python/modtool/modtool_disable.py b/gr-utils/src/python/modtool/modtool_disable.py
index 67f15ad537..b0fb132451 100644
--- a/gr-utils/src/python/modtool/modtool_disable.py
+++ b/gr-utils/src/python/modtool/modtool_disable.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Disable blocks module """
import os
@@ -8,7 +28,6 @@ from optparse import OptionGroup
from modtool_base import ModTool
from cmakefile_editor import CMakeFileEditor
-### Disable module ###########################################################
class ModToolDisable(ModTool):
""" Disable block (comments out CMake entries for files) """
name = 'disable'
diff --git a/gr-utils/src/python/modtool/modtool_help.py b/gr-utils/src/python/modtool/modtool_help.py
index a1dd3c4660..79474a9631 100644
--- a/gr-utils/src/python/modtool/modtool_help.py
+++ b/gr-utils/src/python/modtool/modtool_help.py
@@ -1,30 +1,30 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" The help module """
-from modtool_base import ModTool
-from modtool_info import ModToolInfo
-from modtool_add import ModToolAdd
-from modtool_rm import ModToolRemove
-from modtool_newmod import ModToolNewModule
-from modtool_disable import ModToolDisable
-from modtool_makexml import ModToolMakeXML
-from util_functions import get_command_from_argv
+from gnuradio.modtool import *
+from util_functions import get_command_from_argv, get_class_dict
from templates import Templates
-def get_class_dict():
- " Return a dictionary of the available commands in the form command->class "
- classdict = {}
- for g in globals().values():
- try:
- if issubclass(g, ModTool):
- classdict[g.name] = g
- for a in g.aliases:
- classdict[a] = g
- except (TypeError, AttributeError):
- pass
- return classdict
-
-### Help module ##############################################################
def print_class_descriptions():
''' Go through all ModTool* classes and print their name,
alias and description. '''
diff --git a/gr-utils/src/python/modtool/modtool_info.py b/gr-utils/src/python/modtool/modtool_info.py
index 80fa278321..e774db9114 100644
--- a/gr-utils/src/python/modtool/modtool_info.py
+++ b/gr-utils/src/python/modtool/modtool_info.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Returns information about a module """
import os
@@ -6,7 +26,6 @@ from optparse import OptionGroup
from modtool_base import ModTool
from util_functions import get_modname
-### Info module ##############################################################
class ModToolInfo(ModTool):
""" Return information about a given module """
name = 'info'
diff --git a/gr-utils/src/python/modtool/modtool_makexml.py b/gr-utils/src/python/modtool/modtool_makexml.py
index 5a1a24f1bb..acf3e459c0 100644
--- a/gr-utils/src/python/modtool/modtool_makexml.py
+++ b/gr-utils/src/python/modtool/modtool_makexml.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Automatically create XML bindings for GRC from block code """
import sys
@@ -11,7 +31,6 @@ from parser_cc_block import ParserCCBlock
from grc_xml_generator import GRCXMLGenerator
from cmakefile_editor import CMakeFileEditor
-### Remove module ###########################################################
class ModToolMakeXML(ModTool):
""" Make XML file for GRC block bindings """
name = 'makexml'
diff --git a/gr-utils/src/python/modtool/modtool_newmod.py b/gr-utils/src/python/modtool/modtool_newmod.py
index 0c69cb69e8..7a5f635dde 100644
--- a/gr-utils/src/python/modtool/modtool_newmod.py
+++ b/gr-utils/src/python/modtool/modtool_newmod.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Create a whole new out-of-tree module """
import shutil
@@ -6,7 +26,6 @@ import re
from optparse import OptionGroup
from modtool_base import ModTool
-### New out-of-tree-mod module ###############################################
class ModToolNewModule(ModTool):
""" Create a new out-of-tree module """
name = 'newmod'
@@ -36,7 +55,6 @@ class ModToolNewModule(ModTool):
self._dir = options.directory
if self._dir == '.':
self._dir = './gr-%s' % self._info['modname']
- print 'Module directory is "%s".' % self._dir
try:
os.stat(self._dir)
except OSError:
@@ -56,6 +74,7 @@ class ModToolNewModule(ModTool):
shutil.copytree('/home/braun/.usrlocal/share/gnuradio/modtool/gr-newmod', self._dir)
os.chdir(self._dir)
except OSError:
+ print 'FAILED'
print 'Could not create directory %s. Quitting.' % self._dir
exit(2)
for root, dirs, files in os.walk('.'):
diff --git a/gr-utils/src/python/modtool/modtool_rm.py b/gr-utils/src/python/modtool/modtool_rm.py
index 16bfeb34ce..bdbd802f33 100644
--- a/gr-utils/src/python/modtool/modtool_rm.py
+++ b/gr-utils/src/python/modtool/modtool_rm.py
@@ -1,3 +1,23 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Remove blocks module """
import os
@@ -10,7 +30,6 @@ from util_functions import remove_pattern_from_file
from modtool_base import ModTool
from cmakefile_editor import CMakeFileEditor
-### Remove module ###########################################################
class ModToolRemove(ModTool):
""" Remove block (delete files and remove Makefile entries) """
name = 'remove'
diff --git a/gr-utils/src/python/modtool/parser_cc_block.py b/gr-utils/src/python/modtool/parser_cc_block.py
index 447fe113dd..d11353cc7a 100644
--- a/gr-utils/src/python/modtool/parser_cc_block.py
+++ b/gr-utils/src/python/modtool/parser_cc_block.py
@@ -1,8 +1,27 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
''' A parser for blocks written in C++ '''
import re
import sys
-### Parser for CC blocks ####################################################
def dummy_translator(the_type, default_v=None):
""" Doesn't really translate. """
return the_type
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py
index f41049c5ae..91d8370b98 100644
--- a/gr-utils/src/python/modtool/templates.py
+++ b/gr-utils/src/python/modtool/templates.py
@@ -1,10 +1,28 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
''' All the templates for skeleton files (needed by ModToolAdd) '''
from datetime import datetime
-### Templates ################################################################
Templates = {}
-Templates36 = {}
# Default licence
Templates['defaultlicense'] = '''
diff --git a/gr-utils/src/python/modtool/util_functions.py b/gr-utils/src/python/modtool/util_functions.py
index 029ae04bfa..33d8ad3339 100644
--- a/gr-utils/src/python/modtool/util_functions.py
+++ b/gr-utils/src/python/modtool/util_functions.py
@@ -1,9 +1,28 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
""" Utility functions for gr_modtool.py """
import re
import sys
-### Utility functions ########################################################
def get_command_from_argv(possible_cmds):
""" Read the requested command from argv. This can't be done with optparse,
since the option parser isn't defined before the command is known, and
--
cgit v1.2.3
From 179b6fc774e9053d95bc1ff98427cd618d99501f Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Mon, 28 Jan 2013 11:46:58 +0100
Subject: modtool: more flexibility w/ adding and removing entries
---
gr-utils/src/python/modtool/cmakefile_editor.py | 41 ++++++++++++-------------
1 file changed, 19 insertions(+), 22 deletions(-)
(limited to 'gr-utils/src/python/modtool/cmakefile_editor.py')
diff --git a/gr-utils/src/python/modtool/cmakefile_editor.py b/gr-utils/src/python/modtool/cmakefile_editor.py
index ed5b714253..92121dda3b 100644
--- a/gr-utils/src/python/modtool/cmakefile_editor.py
+++ b/gr-utils/src/python/modtool/cmakefile_editor.py
@@ -30,34 +30,27 @@ class CMakeFileEditor(object):
self.separator = separator
self.indent = indent
- def get_entry_value(self, entry, to_ignore=''):
- """ Get the value of an entry.
- to_ignore is the part of the entry you don't care about. """
- regexp = '%s\(%s([^()]+)\)' % (entry, to_ignore)
- mobj = re.search(regexp, self.cfile, flags=re.MULTILINE)
- if mobj is None:
- return None
- value = mobj.groups()[0].strip()
- return value
-
- def append_value(self, entry, value, to_ignore=''):
+ def append_value(self, entry, value, to_ignore_start='', to_ignore_end=''):
""" Add a value to an entry. """
- regexp = re.compile('(%s\([^()]*?)\s*?(\s?%s)\)' % (entry, to_ignore),
+ regexp = re.compile('(%s\(%s[^()]*?)\s*?(\s?%s)\)' % (entry, to_ignore_start, to_ignore_end),
re.MULTILINE)
substi = r'\1' + self.separator + value + r'\2)'
- self.cfile = regexp.sub(substi, self.cfile, count=1)
+ (self.cfile, nsubs) = regexp.subn(substi, self.cfile, count=1)
+ return nsubs
- def remove_value(self, entry, value, to_ignore=''):
+ def remove_value(self, entry, value, to_ignore_start='', to_ignore_end=''):
"""Remove a value from an entry."""
- regexp = '^\s*(%s\(\s*%s[^()]*?\s*)%s\s*([^()]*\))' % (entry, to_ignore, value)
+ regexp = '^\s*(%s\(\s*%s[^()]*?\s*)%s\s*([^()]*%s\s*\))' % (entry, to_ignore_start, value, to_ignore_end)
regexp = re.compile(regexp, re.MULTILINE)
- self.cfile = re.sub(regexp, r'\1\2', self.cfile, count=1)
+ (self.cfile, nsubs) = re.subn(regexp, r'\1\2', self.cfile, count=1)
+ return nsubs
def delete_entry(self, entry, value_pattern=''):
"""Remove an entry from the current buffer."""
regexp = '%s\s*\([^()]*%s[^()]*\)[^\n]*\n' % (entry, value_pattern)
regexp = re.compile(regexp, re.MULTILINE)
- self.cfile = re.sub(regexp, '', self.cfile, count=1)
+ (self.cfile, nsubs) = re.sub(regexp, '', self.cfile, count=1)
+ return nsubs
def write(self):
""" Write the changes back to the file. """
@@ -82,7 +75,14 @@ class CMakeFileEditor(object):
return filenames
def disable_file(self, fname):
- """ Comment out a file """
+ """ Comment out a file.
+ Example:
+ add_library(
+ file1.cc
+ )
+
+ Here, file1.cc becomes #file1.cc with disable_file('file1.cc').
+ """
starts_line = False
for line in self.cfile.splitlines():
if len(line.strip()) == 0 or line.strip()[0] == '#':
@@ -109,8 +109,5 @@ class CMakeFileEditor(object):
def check_for_glob(self, globstr):
""" Returns true if a glob as in globstr is found in the cmake file """
glob_re = r'GLOB\s[a-z_]+\s"%s"' % globstr.replace('*', '\*')
- if re.search(glob_re, self.cfile, flags=re.MULTILINE|re.IGNORECASE) is not None:
- return True
- else:
- return False
+ return re.search(glob_re, self.cfile, flags=re.MULTILINE|re.IGNORECASE) is not None
--
cgit v1.2.3
From 2d695b3c4c86b5c206f95dcc1d71f97d808d98b8 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Mon, 28 Jan 2013 15:26:05 +0100
Subject: modtool: cleanup, bugfixes
---
gr-utils/src/python/gr_modtool | 20 +-----------------
gr-utils/src/python/modtool/__init__.py | 5 +++--
gr-utils/src/python/modtool/cmakefile_editor.py | 2 +-
gr-utils/src/python/modtool/modtool_add.py | 1 -
gr-utils/src/python/modtool/modtool_base.py | 28 ++++++++++++++++++++-----
gr-utils/src/python/modtool/modtool_disable.py | 19 ++---------------
gr-utils/src/python/modtool/modtool_help.py | 4 ++--
gr-utils/src/python/modtool/modtool_info.py | 2 +-
gr-utils/src/python/modtool/modtool_makexml.py | 26 +++++++----------------
gr-utils/src/python/modtool/modtool_newmod.py | 2 +-
gr-utils/src/python/modtool/modtool_rm.py | 19 ++---------------
gr-utils/src/python/modtool/parser_cc_block.py | 5 +++--
gr-utils/src/python/modtool/templates.py | 6 +++---
gr-utils/src/python/modtool/util_functions.py | 19 ++++-------------
14 files changed, 53 insertions(+), 105 deletions(-)
(limited to 'gr-utils/src/python/modtool/cmakefile_editor.py')
diff --git a/gr-utils/src/python/gr_modtool b/gr-utils/src/python/gr_modtool
index bc41d56f55..8c5c710aff 100755
--- a/gr-utils/src/python/gr_modtool
+++ b/gr-utils/src/python/gr_modtool
@@ -24,24 +24,9 @@
import sys
from gnuradio.modtool import *
-def get_class_dict():
- " Return a dictionary of the available commands in the form command->class "
- classdict = {}
- for g in globals().values():
- try:
- if issubclass(g, ModTool):
- classdict[g.name] = g
- for a in g.aliases:
- classdict[a] = g
- except (TypeError, AttributeError):
- pass
- return classdict
-
-
-### Main code ################################################################
def main():
""" Here we go. Parse command, choose class and run. """
- cmd_dict = get_class_dict()
+ cmd_dict = get_class_dict(globals().values())
command = get_command_from_argv(cmd_dict.keys())
if command is None:
print 'Usage:' + templates.Templates['usage']
@@ -51,9 +36,6 @@ def main():
modtool.run()
if __name__ == '__main__':
- if not ((sys.version_info[0] > 2) or
- (sys.version_info[0] == 2 and sys.version_info[1] >= 7)):
- print "Using Python < 2.7 is not recommended for gr_modtool."
try:
main()
except KeyboardInterrupt:
diff --git a/gr-utils/src/python/modtool/__init__.py b/gr-utils/src/python/modtool/__init__.py
index 7935e4b482..a242722ab4 100644
--- a/gr-utils/src/python/modtool/__init__.py
+++ b/gr-utils/src/python/modtool/__init__.py
@@ -22,13 +22,14 @@
from cmakefile_editor import CMakeFileEditor
from code_generator import GRMTemplate
from grc_xml_generator import GRCXMLGenerator
+from modtool_base import ModTool, get_class_dict
from modtool_add import ModToolAdd
-from modtool_base import ModTool
from modtool_disable import ModToolDisable
-from modtool_help import ModToolHelp
from modtool_info import ModToolInfo
from modtool_makexml import ModToolMakeXML
from modtool_newmod import ModToolNewModule
from modtool_rm import ModToolRemove
+# Leave this at the end
+from modtool_help import ModToolHelp
from parser_cc_block import ParserCCBlock
from util_functions import *
diff --git a/gr-utils/src/python/modtool/cmakefile_editor.py b/gr-utils/src/python/modtool/cmakefile_editor.py
index 92121dda3b..3d90b8d163 100644
--- a/gr-utils/src/python/modtool/cmakefile_editor.py
+++ b/gr-utils/src/python/modtool/cmakefile_editor.py
@@ -49,7 +49,7 @@ class CMakeFileEditor(object):
"""Remove an entry from the current buffer."""
regexp = '%s\s*\([^()]*%s[^()]*\)[^\n]*\n' % (entry, value_pattern)
regexp = re.compile(regexp, re.MULTILINE)
- (self.cfile, nsubs) = re.sub(regexp, '', self.cfile, count=1)
+ (self.cfile, nsubs) = re.subn(regexp, '', self.cfile, count=1)
return nsubs
def write(self):
diff --git a/gr-utils/src/python/modtool/modtool_add.py b/gr-utils/src/python/modtool/modtool_add.py
index 32cfe04408..7ca375b6f9 100644
--- a/gr-utils/src/python/modtool/modtool_add.py
+++ b/gr-utils/src/python/modtool/modtool_add.py
@@ -45,7 +45,6 @@ class ModToolAdd(ModTool):
def setup_parser(self):
parser = ModTool.setup_parser(self)
- parser.usage = '%prog add [options]. \n Call %prog without any options to run it interactively.'
ogroup = OptionGroup(parser, "Add module options")
ogroup.add_option("-t", "--block-type", type="choice",
choices=self._block_types, default=None, help="One of %s." % ', '.join(self._block_types))
diff --git a/gr-utils/src/python/modtool/modtool_base.py b/gr-utils/src/python/modtool/modtool_base.py
index d824910e95..3f8f2bc3c7 100644
--- a/gr-utils/src/python/modtool/modtool_base.py
+++ b/gr-utils/src/python/modtool/modtool_base.py
@@ -28,6 +28,7 @@ from optparse import OptionParser, OptionGroup
from util_functions import get_modname
from templates import Templates
+
class ModTool(object):
""" Base class for all modtool command classes. """
def __init__(self):
@@ -47,15 +48,17 @@ class ModTool(object):
def setup_parser(self):
""" Init the option parser. If derived classes need to add options,
override this and call the parent function. """
- parser = OptionParser(usage=Templates['usage'], add_help_option=False)
+ parser = OptionParser(add_help_option=False)
+ parser.usage = '%prog ' + self.name + ' [options] <PATTERN> \n' + \
+ ' Call "%prog ' + self.name + '" without any options to run it interactively.'
ogroup = OptionGroup(parser, "General options")
ogroup.add_option("-h", "--help", action="help", help="Displays this help message.")
ogroup.add_option("-d", "--directory", type="string", default=".",
- help="Base directory of the module.")
+ help="Base directory of the module. Defaults to the cwd.")
ogroup.add_option("-n", "--module-name", type="string", default=None,
- help="Name of the GNU Radio module. If possible, this gets detected from CMakeLists.txt.")
+ help="Use this to override the current module's name (is normally autodetected).")
ogroup.add_option("-N", "--block-name", type="string", default=None,
- help="Name of the block, minus the module name prefix.")
+ help="Name of the block, where applicable.")
ogroup.add_option("--skip-lib", action="store_true", default=False,
help="Don't do anything in the lib/ subdirectory.")
ogroup.add_option("--skip-swig", action="store_true", default=False,
@@ -64,6 +67,8 @@ class ModTool(object):
help="Don't do anything in the python/ subdirectory.")
ogroup.add_option("--skip-grc", action="store_true", default=False,
help="Don't do anything in the grc/ subdirectory.")
+ ogroup.add_option("-y", "--yes", action="store_true", default=False,
+ help="Answer all questions with 'yes'. This can overwrite and delete your files, so be careful.")
parser.add_option_group(ogroup)
return parser
@@ -74,7 +79,6 @@ class ModTool(object):
if not self._check_directory(self._dir):
print "No GNU Radio module found in the given directory. Quitting."
sys.exit(1)
- print "Operating in directory " + self._dir
if options.module_name is not None:
self._info['modname'] = options.module_name
else:
@@ -96,6 +100,7 @@ class ModTool(object):
self._info['blockname'] = options.block_name
self.options = options
self._setup_files()
+ self._info['yes'] = options.yes
def _setup_files(self):
""" Initialise the self._file[] dictionary """
@@ -156,3 +161,16 @@ class ModTool(object):
""" Override this. """
pass
+def get_class_dict(the_globals):
+ " Return a dictionary of the available commands in the form command->class "
+ classdict = {}
+ for g in the_globals:
+ try:
+ if issubclass(g, ModTool):
+ classdict[g.name] = g
+ for a in g.aliases:
+ classdict[a] = g
+ except (TypeError, AttributeError):
+ pass
+ return classdict
+
diff --git a/gr-utils/src/python/modtool/modtool_disable.py b/gr-utils/src/python/modtool/modtool_disable.py
index b0fb132451..36725e5578 100644
--- a/gr-utils/src/python/modtool/modtool_disable.py
+++ b/gr-utils/src/python/modtool/modtool_disable.py
@@ -35,24 +35,10 @@ class ModToolDisable(ModTool):
def __init__(self):
ModTool.__init__(self)
- def setup_parser(self):
- " Initialise the option parser for 'gr_modtool.py rm' "
- parser = ModTool.setup_parser(self)
- parser.usage = '%prog disable [options]. \n Call %prog without any options to run it interactively.'
- ogroup = OptionGroup(parser, "Disable module options")
- ogroup.add_option("-p", "--pattern", type="string", default=None,
- help="Filter possible choices for blocks to be disabled.")
- ogroup.add_option("-y", "--yes", action="store_true", default=False,
- help="Answer all questions with 'yes'.")
- parser.add_option_group(ogroup)
- return parser
-
def setup(self):
ModTool.setup(self)
options = self.options
- if options.pattern is not None:
- self._info['pattern'] = options.pattern
- elif options.block_name is not None:
+ if options.block_name is not None:
self._info['pattern'] = options.block_name
elif len(self.args) >= 2:
self._info['pattern'] = self.args[1]
@@ -60,7 +46,6 @@ class ModToolDisable(ModTool):
self._info['pattern'] = raw_input('Which blocks do you want to disable? (Regex): ')
if len(self._info['pattern']) == 0:
self._info['pattern'] = '.'
- self._info['yes'] = options.yes
def run(self):
""" Go, go, go! """
@@ -123,7 +108,7 @@ class ModToolDisable(ModTool):
swigfile = re.sub('(GR_SWIG_BLOCK_MAGIC2?.+'+blockname+'.+;)', r'//\1', swigfile)
open(self._file['swig'], 'w').write(swigfile)
return False
- # List of special rules: 0: subdir, 1: filename re match, 2: function
+ # List of special rules: 0: subdir, 1: filename re match, 2: callback
special_treatments = (
('python', 'qa.+py$', _handle_py_qa),
('python', '^(?!qa).+py$', _handle_py_mod),
diff --git a/gr-utils/src/python/modtool/modtool_help.py b/gr-utils/src/python/modtool/modtool_help.py
index 79474a9631..76d9fd28bd 100644
--- a/gr-utils/src/python/modtool/modtool_help.py
+++ b/gr-utils/src/python/modtool/modtool_help.py
@@ -21,7 +21,7 @@
""" The help module """
from gnuradio.modtool import *
-from util_functions import get_command_from_argv, get_class_dict
+from util_functions import get_command_from_argv
from templates import Templates
@@ -51,7 +51,7 @@ class ModToolHelp(ModTool):
pass
def run(self):
- cmd_dict = get_class_dict()
+ cmd_dict = get_class_dict(globals().values())
cmds = cmd_dict.keys()
cmds.remove(self.name)
for a in self.aliases:
diff --git a/gr-utils/src/python/modtool/modtool_info.py b/gr-utils/src/python/modtool/modtool_info.py
index e774db9114..680bd41b99 100644
--- a/gr-utils/src/python/modtool/modtool_info.py
+++ b/gr-utils/src/python/modtool/modtool_info.py
@@ -34,7 +34,7 @@ class ModToolInfo(ModTool):
ModTool.__init__(self)
def setup_parser(self):
- " Initialise the option parser for 'gr_modtool.py info' "
+ " Initialise the option parser for 'gr_modtool info' "
parser = ModTool.setup_parser(self)
parser.usage = '%prog info [options]. \n Call %prog without any options to run it interactively.'
ogroup = OptionGroup(parser, "Info options")
diff --git a/gr-utils/src/python/modtool/modtool_makexml.py b/gr-utils/src/python/modtool/modtool_makexml.py
index 104a0fdbde..777cc09e1f 100644
--- a/gr-utils/src/python/modtool/modtool_makexml.py
+++ b/gr-utils/src/python/modtool/modtool_makexml.py
@@ -30,6 +30,7 @@ from modtool_base import ModTool
from parser_cc_block import ParserCCBlock
from grc_xml_generator import GRCXMLGenerator
from cmakefile_editor import CMakeFileEditor
+from util_functions import ask_yes_no
class ModToolMakeXML(ModTool):
""" Make XML file for GRC block bindings """
@@ -38,24 +39,10 @@ class ModToolMakeXML(ModTool):
def __init__(self):
ModTool.__init__(self)
- def setup_parser(self):
- " Initialise the option parser for 'gr_modtool.py makexml' "
- parser = ModTool.setup_parser(self)
- parser.usage = '%prog makexml [options]. \n Call %prog without any options to run it interactively.'
- ogroup = OptionGroup(parser, "Make XML module options")
- ogroup.add_option("-p", "--pattern", type="string", default=None,
- help="Filter possible choices for blocks to be parsed.")
- ogroup.add_option("-y", "--yes", action="store_true", default=False,
- help="Answer all questions with 'yes'. This can overwrite existing files!")
- parser.add_option_group(ogroup)
- return parser
-
def setup(self):
ModTool.setup(self)
options = self.options
- if options.pattern is not None:
- self._info['pattern'] = options.pattern
- elif options.block_name is not None:
+ if options.block_name is not None:
self._info['pattern'] = options.block_name
elif len(self.args) >= 2:
self._info['pattern'] = self.args[1]
@@ -63,7 +50,6 @@ class ModToolMakeXML(ModTool):
self._info['pattern'] = raw_input('Which blocks do you want to parse? (Regex): ')
if len(self._info['pattern']) == 0:
self._info['pattern'] = '.'
- self._info['yes'] = options.yes
def run(self):
""" Go, go, go! """
@@ -109,8 +95,11 @@ class ModToolMakeXML(ModTool):
'default': '2',
'in_constructor': False})
if os.path.isfile(os.path.join('grc', fname_xml)):
- # TODO add an option to keep
- print "Warning: Overwriting existing GRC file."
+ if not self._info['yes']:
+ if not ask_yes_no('Overwrite existing GRC file?', False):
+ return
+ else:
+ print "Warning: Overwriting existing GRC file."
grc_generator = GRCXMLGenerator(
modname=self._info['modname'],
blockname=blockname,
@@ -167,4 +156,3 @@ class ModToolMakeXML(ModTool):
sys.exit(1)
return (parser.read_params(), parser.read_io_signature(), blockname)
-
diff --git a/gr-utils/src/python/modtool/modtool_newmod.py b/gr-utils/src/python/modtool/modtool_newmod.py
index 5e14493c3c..102d83d8df 100644
--- a/gr-utils/src/python/modtool/modtool_newmod.py
+++ b/gr-utils/src/python/modtool/modtool_newmod.py
@@ -35,7 +35,7 @@ class ModToolNewModule(ModTool):
ModTool.__init__(self)
def setup_parser(self):
- " Initialise the option parser for 'gr_modtool.py newmod' "
+ " Initialise the option parser for 'gr_modtool newmod' "
parser = ModTool.setup_parser(self)
parser.usage = '%prog rm [options]. \n Call %prog without any options to run it interactively.'
ogroup = OptionGroup(parser, "New out-of-tree module options")
diff --git a/gr-utils/src/python/modtool/modtool_rm.py b/gr-utils/src/python/modtool/modtool_rm.py
index 02ce8ef3f2..32dfee4806 100644
--- a/gr-utils/src/python/modtool/modtool_rm.py
+++ b/gr-utils/src/python/modtool/modtool_rm.py
@@ -37,24 +37,10 @@ class ModToolRemove(ModTool):
def __init__(self):
ModTool.__init__(self)
- def setup_parser(self):
- " Initialise the option parser for 'gr_modtool.py rm' "
- parser = ModTool.setup_parser(self)
- parser.usage = '%prog rm [options]. \n Call %prog without any options to run it interactively.'
- ogroup = OptionGroup(parser, "Remove module options")
- ogroup.add_option("-p", "--pattern", type="string", default=None,
- help="Filter possible choices for blocks to be deleted.")
- ogroup.add_option("-y", "--yes", action="store_true", default=False,
- help="Answer all questions with 'yes'.")
- parser.add_option_group(ogroup)
- return parser
-
def setup(self):
ModTool.setup(self)
options = self.options
- if options.pattern is not None:
- self._info['pattern'] = options.pattern
- elif options.block_name is not None:
+ if options.block_name is not None:
self._info['pattern'] = options.block_name
elif len(self.args) >= 2:
self._info['pattern'] = self.args[1]
@@ -62,7 +48,6 @@ class ModToolRemove(ModTool):
self._info['pattern'] = raw_input('Which blocks do you want to delete? (Regex): ')
if len(self._info['pattern']) == 0:
self._info['pattern'] = '.'
- self._info['yes'] = options.yes
def run(self):
""" Go, go, go! """
@@ -108,7 +93,7 @@ class ModToolRemove(ModTool):
return regexp
# Go, go, go!
if not self._skip_subdirs['lib']:
- self._run_subdir('lib', ('*.cc', '*.h'), ('add_library',),
+ self._run_subdir('lib', ('*.cc', '*.h'), ('add_library', 'list'),
cmakeedit_func=_remove_cc_test_case)
if not self._skip_subdirs['include']:
incl_files_deleted = self._run_subdir(self._info['includedir'], ('*.h',), ('install',))
diff --git a/gr-utils/src/python/modtool/parser_cc_block.py b/gr-utils/src/python/modtool/parser_cc_block.py
index d11353cc7a..0d1d75f29a 100644
--- a/gr-utils/src/python/modtool/parser_cc_block.py
+++ b/gr-utils/src/python/modtool/parser_cc_block.py
@@ -121,12 +121,13 @@ class ParserCCBlock(object):
if not in_string:
if c[i] == ')':
if parens_count == 0:
- if read_state == 'type':
+ if read_state == 'type' and len(this_type):
raise ValueError(
'Found closing parentheses before finishing last argument (this is how far I got: %s)'
% str(param_list)
)
- param_list.append((this_type, this_name, this_defv))
+ if len(this_type):
+ param_list.append((this_type, this_name, this_defv))
end_of_list = True
break
else:
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py
index 91d8370b98..8777357112 100644
--- a/gr-utils/src/python/modtool/templates.py
+++ b/gr-utils/src/python/modtool/templates.py
@@ -490,9 +490,9 @@ Templates['grc_xml'] = '''<?xml version="1.0"?>
# Usage
Templates['usage'] = '''
-gr_modtool.py <command> [options] -- Run <command> with the given options.
-gr_modtool.py help -- Show a list of commands.
-gr_modtool.py help <command> -- Shows the help for a given command. '''
+gr_modtool <command> [options] -- Run <command> with the given options.
+gr_modtool help -- Show a list of commands.
+gr_modtool help <command> -- Shows the help for a given command. '''
# SWIG string
Templates['swig_block_magic'] = """#if $version == '37'
diff --git a/gr-utils/src/python/modtool/util_functions.py b/gr-utils/src/python/modtool/util_functions.py
index 33d8ad3339..4ca294ac31 100644
--- a/gr-utils/src/python/modtool/util_functions.py
+++ b/gr-utils/src/python/modtool/util_functions.py
@@ -18,11 +18,13 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
#
-""" Utility functions for gr_modtool.py """
+""" Utility functions for gr_modtool """
import re
import sys
+# None of these must depend on other modtool stuff!
+
def get_command_from_argv(possible_cmds):
""" Read the requested command from argv. This can't be done with optparse,
since the option parser isn't defined before the command is known, and
@@ -38,7 +40,7 @@ def get_command_from_argv(possible_cmds):
return None
def append_re_line_sequence(filename, linepattern, newline):
- """Detects the re 'linepattern' in the file. After its last occurrence,
+ """ Detects the re 'linepattern' in the file. After its last occurrence,
paste 'newline'. If the pattern does not exist, append the new line
to the file. Then, write. """
oldfile = open(filename, 'r').read()
@@ -99,19 +101,6 @@ def get_modname():
except AttributeError:
return None
-def get_class_dict():
- " Return a dictionary of the available commands in the form command->class "
- classdict = {}
- for g in globals().values():
- try:
- if issubclass(g, ModTool):
- classdict[g.name] = g
- for a in g.aliases:
- classdict[a] = g
- except (TypeError, AttributeError):
- pass
- return classdict
-
def is_number(s):
" Return True if the string s contains a number. "
try:
--
cgit v1.2.3