From 055287896c8c97eb0cdda825559e217d8db54a14 Mon Sep 17 00:00:00 2001
From: Swapnil Negi <swapnil.negi09@gmail.com>
Date: Fri, 4 Jan 2019 18:29:50 +0100
Subject: modtool: gr-modtool overhaul GSoC 2018
This commit contains all the changes done during the 2018 GSoC
"gr-modtool overhaul".
Changes include:
- Rewrite of gr-modtool based on Python Click
- Split of gr-modtool in cli and core
- Adherence to new GNU Radio 3.8 API for OOTs
- Pylint improvements
- Py3k and Py2k compatibility
This feature is merged in a squash-merge due to big refactoring
on the head and base branch and the impossibility to unclutter both.
---
gr-utils/python/modtool/modtool_rm.py | 180 ----------------------------------
1 file changed, 180 deletions(-)
delete mode 100644 gr-utils/python/modtool/modtool_rm.py
(limited to 'gr-utils/python/modtool/modtool_rm.py')
diff --git a/gr-utils/python/modtool/modtool_rm.py b/gr-utils/python/modtool/modtool_rm.py
deleted file mode 100644
index 55598a5090..0000000000
--- a/gr-utils/python/modtool/modtool_rm.py
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# 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 """
-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import os
-import re
-import sys
-import glob
-
-from .util_functions import remove_pattern_from_file, SequenceCompleter
-from .modtool_base import ModTool
-from .cmakefile_editor import CMakeFileEditor
-
-
-class ModToolRemove(ModTool):
- """ Remove block (delete files and remove Makefile entries) """
- name = 'remove'
- description = 'Remove block from module.'
-
- def __init__(self):
- ModTool.__init__(self)
-
- @staticmethod
- def setup_parser(parser):
- ModTool.setup_parser_block(parser)
-
- def setup(self, options):
- ModTool.setup(self, options)
-
- if options.blockname is not None:
- self._info['pattern'] = options.blockname
- else:
- block_candidates = self.get_block_candidates()
- with SequenceCompleter(block_candidates):
- self._info['pattern'] = input('Which blocks do you want to delete? (Regex): ')
- if not self._info['pattern'] or self._info['pattern'].isspace():
- self._info['pattern'] = '.'
-
- def run(self, options):
- """ Go, go, go! """
- def _remove_cc_test_case(filename=None, ed=None):
- """ Special function that removes the occurrences of a qa*.cc file
- from the CMakeLists.txt. """
- if filename[:2] != 'qa':
- return
- if self._info['version'] == '37':
- (base, ext) = os.path.splitext(filename)
- if ext == '.h':
- remove_pattern_from_file(self._file['qalib'],
- r'^#include "%s"\s*$' % filename)
- remove_pattern_from_file(self._file['qalib'],
- r'^\s*s->addTest\(gr::%s::%s::suite\(\)\);\s*$' % (
- self._info['modname'], base)
- )
- self.scm.mark_file_updated(self._file['qalib'])
- elif ext == '.cc':
- ed.remove_value('list',
- r'\$\{CMAKE_CURRENT_SOURCE_DIR\}/%s' % filename,
- to_ignore_start='APPEND test_%s_sources' % self._info['modname'])
- self.scm.mark_file_updated(ed.filename)
- 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'])
- self.scm.mark_file_updated(ed.filename)
- else:
- filebase = os.path.splitext(filename)[0]
- ed.delete_entry('add_executable', filebase)
- ed.delete_entry('target_link_libraries', filebase)
- ed.delete_entry('GR_ADD_TEST', filebase)
- ed.remove_double_newlines()
- self.scm.mark_file_updated(ed.filename)
-
- def _remove_py_test_case(filename=None, ed=None):
- """ Special function that removes the occurrences of a qa*.{cc,h} file
- from the CMakeLists.txt and the qa_$modname.cc. """
- if filename[:2] != 'qa':
- return
- filebase = os.path.splitext(filename)[0]
- ed.delete_entry('GR_ADD_TEST', filebase)
- ed.remove_double_newlines()
-
- def _make_swig_regex(filename):
- filebase = os.path.splitext(filename)[0]
- pyblockname = filebase.replace(self._info['modname'] + '_', '')
- regexp = r'(^\s*GR_SWIG_BLOCK_MAGIC2?\(%s,\s*%s\);|^\s*.include\s*"(%s/)?%s"\s*)' % \
- (self._info['modname'], pyblockname, self._info['modname'], filename)
- return regexp
- # Go, go, go!
- self.setup(options)
- if not self._skip_subdirs['lib']:
- 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',))
- if not self._skip_subdirs['swig']:
- swig_files_deleted = self._run_subdir('swig', ('*.i',), ('install',))
- for f in incl_files_deleted + swig_files_deleted:
- # TODO do this on all *.i files
- remove_pattern_from_file(self._file['swig'], _make_swig_regex(f))
- self.scm.mark_file_updated(self._file['swig'])
- if not self._skip_subdirs['python']:
- py_files_deleted = self._run_subdir('python', ('*.py',), ('GR_PYTHON_INSTALL',),
- cmakeedit_func=_remove_py_test_case)
- for f in py_files_deleted:
- remove_pattern_from_file(self._file['pyinit'], r'.*import\s+%s.*' % f[:-3])
- remove_pattern_from_file(self._file['pyinit'], r'.*from\s+%s\s+import.*\n' % f[:-3])
- if not self._skip_subdirs['grc']:
- self._run_subdir('grc', ('*.xml',), ('install',))
-
- def _run_subdir(self, path, globs, makefile_vars, cmakeedit_func=None):
- """ Delete all files that match a certain pattern in path.
- path - The directory in which this will take place
- globs - A tuple of standard UNIX globs of files to delete (e.g. *.xml)
- makefile_vars - A tuple with a list of CMakeLists.txt-variables which
- may contain references to the globbed files
- cmakeedit_func - If the CMakeLists.txt needs special editing, use this
- """
- # 1. Create a filtered list
- files = []
- for g in globs:
- files = files + sorted(glob.glob("%s/%s"% (path, g)))
- files_filt = []
- print("Searching for matching files in %s/:" % path)
- for f in files:
- if re.search(self._info['pattern'], os.path.basename(f)) is not None:
- files_filt.append(f)
- if len(files_filt) == 0:
- print("None found.")
- return []
- # 2. Delete files, Makefile entries and other occurrences
- files_deleted = []
- ed = CMakeFileEditor('%s/CMakeLists.txt' % path)
- yes = self._info['yes']
- for f in files_filt:
- b = os.path.basename(f)
- if not yes:
- ans = input("Really delete %s? [Y/n/a/q]: " % f).lower().strip()
- if ans == 'a':
- yes = True
- if ans == 'q':
- sys.exit(0)
- if ans == 'n':
- continue
- files_deleted.append(b)
- print("Deleting %s." % f)
- self.scm.remove_file(f)
- os.unlink(f)
- print("Deleting occurrences of %s from %s/CMakeLists.txt..." % (b, path))
- for var in makefile_vars:
- ed.remove_value(var, b)
- if cmakeedit_func is not None:
- cmakeedit_func(b, ed)
- ed.write()
- self.scm.mark_files_updated(('%s/CMakeLists.txt' % path,))
- return files_deleted
--
cgit v1.2.3