From 0c3c379f696ef7895d472ebe8940b33d4792006f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Apr 2023 10:05:06 +1000 Subject: [PATCH] Tools: remove references to modules/uavcan --- Tools/ardupilotwaf/uavcangen.py | 76 --------------------------------- Tools/scripts/run_coverage.py | 2 - 2 files changed, 78 deletions(-) delete mode 100644 Tools/ardupilotwaf/uavcangen.py diff --git a/Tools/ardupilotwaf/uavcangen.py b/Tools/ardupilotwaf/uavcangen.py deleted file mode 100644 index 7ee2d7e01f..0000000000 --- a/Tools/ardupilotwaf/uavcangen.py +++ /dev/null @@ -1,76 +0,0 @@ -# encoding: utf-8 - -""" -generate DSDLC headers for uavcan -""" - -from waflib import Logs, Task, Utils, Node -from waflib.TaskGen import feature, before_method, extension -import os -import os.path -from xml.etree import ElementTree as et - -class uavcangen(Task.Task): - """generate uavcan header files""" - color = 'BLUE' - before = 'cxx c' - - def run(self): - python = self.env.get_flat('PYTHON') - out = self.env.get_flat('OUTPUT_DIR') - src = self.env.get_flat('SRC') - dsdlc = self.env.get_flat("UC_DSDL_COMPILER") - - ret = self.exec_command(['{}'.format(python), - '{}'.format(dsdlc), - '-O{}'.format(out)] + [x.abspath() for x in self.inputs]) - - if ret != 0: - # ignore if there was a signal to the interpreter rather - # than a real error in the script. Some environments use a - # signed and some an unsigned return for this - if ret > 128 or ret < 0: - Logs.warn('uavcangen crashed with code: {}'.format(ret)) - ret = 0 - else: - Logs.error('uavcangen returned {} error code'.format(ret)) - return ret - - def post_run(self): - super(uavcangen, self).post_run() - for header in self.generator.output_dir.ant_glob("*.hpp **/*.hpp", remove=False): - header.sig = header.cache_sig = self.cache_sig - -def options(opt): - opt.load('python') - -@feature('uavcangen') -@before_method('process_source') -def process_uavcangen(self): - if not hasattr(self, 'output_dir'): - self.bld.fatal('uavcangen: missing option output_dir') - - inputs = self.to_nodes(self.source) - outputs = [] - - self.source = [] - - if not isinstance(self.output_dir, Node.Node): - self.output_dir = self.bld.bldnode.find_or_declare(self.output_dir) - - task = self.create_task('uavcangen', inputs, outputs) - task.env['OUTPUT_DIR'] = self.output_dir.abspath() - - task.env.env = dict(os.environ) - -def configure(cfg): - """ - setup environment for uavcan header generator - """ - cfg.load('python') - cfg.check_python_version(minver=(2,7,0)) - - env = cfg.env - env.UC_DSDL_COMPILER_DIR = cfg.srcnode.make_node('modules/uavcan/libuavcan/dsdl_compiler').abspath() - env.UC_DSDL_COMPILER = env.UC_DSDL_COMPILER_DIR + '/libuavcan_dsdlc' - cfg.msg('UC_DSDL compiler', env.UC_DSDL_COMPILER) diff --git a/Tools/scripts/run_coverage.py b/Tools/scripts/run_coverage.py index d21a0dec63..3c254e205e 100755 --- a/Tools/scripts/run_coverage.py +++ b/Tools/scripts/run_coverage.py @@ -82,7 +82,6 @@ class CoverageRunner(object): "--no-external", "--initial", "--capture", - "--exclude", root_dir + "/modules/uavcan/*", "--exclude", root_dir + "/build/sitl/modules/*", "--directory", root_dir, "-o", self.INFO_FILE_BASE, @@ -227,7 +226,6 @@ class CoverageRunner(object): "--remove", self.INFO_FILE, ".waf*", root_dir + "/modules/gtest/*", - root_dir + "/modules/uavcan/*", root_dir + "/modules/DroneCAN/libcanard/*", root_dir + "/build/linux/libraries/*", root_dir + "/build/sitl/libraries/*",