From d84a7084c49d2e0829bb170d8f5770929ffbfa89 Mon Sep 17 00:00:00 2001
From: "Maaike Zijderveld, iolar" <git.mail@iolar.nl>
Date: Thu, 16 Jan 2025 12:38:02 +0100
Subject: [PATCH 1/2] Create script to remove orphaned object / gcno files and
 all gcda files

Move coverage script to ev dev tools

Rename coverage tool to ev-coverage

Update ev coverage tool so it can be expanded easily. Make some ifs / for loops shorter. Add .idea to .gitignore.

Add version information.

Add "rm" as alias for remove_files

Prevent crash when source file cannot be found in current source tree

This seems to be the case for object files in _deps subdirs where the corresponding source code location isn't immediately obvious to this tool
At the moment these .o file are removed as well but this may not be desired behavior

Added --dry-run
Added --silent to suppress all output
Added --summary to print a summary of the number of removed/to-be-removed files

Use dwarfdump or gdb to find the correct cpp file that belongs to the object file.

Fix dwarfdump result where a list of multiple files is returned instead of one file.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>
Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
---
 applications/utils/.gitignore                 |   1 +
 applications/utils/ev-dev-tools/README.rst    |  65 +++++++
 applications/utils/ev-dev-tools/setup.cfg     |  13 +-
 .../utils/ev-dev-tools/src/ev_cli/__init__.py |   4 +-
 .../ev-dev-tools/src/ev_coverage/__init__.py  |   4 +
 .../utils/ev-dev-tools/src/ev_coverage/cov.py | 163 ++++++++++++++++++
 applications/utils/ev-dev-tools/version.txt   |   1 +
 7 files changed, 245 insertions(+), 6 deletions(-)
 create mode 100644 applications/utils/ev-dev-tools/src/ev_coverage/__init__.py
 create mode 100644 applications/utils/ev-dev-tools/src/ev_coverage/cov.py
 create mode 100644 applications/utils/ev-dev-tools/version.txt

diff --git a/applications/utils/.gitignore b/applications/utils/.gitignore
index 8c6ca43d2a..340cab631e 100644
--- a/applications/utils/.gitignore
+++ b/applications/utils/.gitignore
@@ -1,3 +1,4 @@
 **/__pycache__
 workspace.yaml
 /bazel-*
+/.idea
diff --git a/applications/utils/ev-dev-tools/README.rst b/applications/utils/ev-dev-tools/README.rst
index ec307813b5..213d9f7396 100644
--- a/applications/utils/ev-dev-tools/README.rst
+++ b/applications/utils/ev-dev-tools/README.rst
@@ -193,3 +193,68 @@ Auto generating NodeJS modules
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 **tbd**
+
+
+
+======================
+EVerest code coverage
+======================
+
+This python project currently consists of the following packages
+
+- `ev-coverage`: EVerest module auto generation
+
+Install
+-------
+To install `ev-coverage`:
+
+    python3 -m pip install .
+
+ev-coverage
+-----------
+
+Script to be able to remove unnecessary files that are used for coverage information.
+
+| When compiling the C++ code, for each class a `.o` object file is created.
+| When compiling with coverage flags, the compiler also creates `.gcno` files.
+| When running the executable, it will write the coverage information to `.gcda` files.
+| `.gcov` files are created when the gcovr is running. This will read the `.gcda` files combined with the `.gcno` files
+  and creates the `.gcov` files and depending on the options also xml and html files containing readable coverage
+  information.
+
+This script is doing two things:
+- It removes all gcda files.
+- It searches for dangling / orphaned object files and removes them. It will also remove the dangling `.gcno` files.
+
+Dangling / orphaned object files can exist when switching branches and in the old branch was a file that does not exist
+in the new branch. When running gcovr in the new branch, it will fail with a file not found error. After running this
+script and re-running the unit tests and gcovr, this should not occur anymore.
+
+Note: this script can use llvm-dwarfdump or gdb. gdb is very slow, so if you want a better experience, just install
+      llvm-dwarfdump
+
+
+Usage:
+
+    ev-coverage remove_files --build-dir <build-dir>
+
+Required options:
+- --build-dir
+  Build directory. In some subdirectory of this build dir, the object, gcno and gcda files are present.
+
+Other options:
+- --version
+  Only show version of the tool and quit
+- --dry-run
+  Does not remove any files
+- --summary
+  Show a summary of removed files
+- --silent
+  Suppress all output, summary is still shown when requested
+
+
+Example usage:
+
+For only removing the files from libocpp built from the everest repo:
+
+    ev-coverage remove_files --build-dir=/data/work/pionix/workspace/everest-core/build/_deps/libocpp-build
\ No newline at end of file
diff --git a/applications/utils/ev-dev-tools/setup.cfg b/applications/utils/ev-dev-tools/setup.cfg
index 0ae08d9712..1d2ad11209 100644
--- a/applications/utils/ev-dev-tools/setup.cfg
+++ b/applications/utils/ev-dev-tools/setup.cfg
@@ -1,8 +1,8 @@
 [metadata]
 name = ev-dev-tools
-version = attr: ev_cli.__version__
-author = aw
-author_email = aw@pionix.de
+version = file: version.txt
+author = aw, Maaike Zijderveld
+author_email = aw@pionix.de, maaike@pionix.de
 description = Utilities for developing with the everest framework
 long_description = file: README.rst
 long_description_content_type = text/x-rst
@@ -20,12 +20,15 @@ install_requires =
     pyyaml
 package_dir =
     = src
-packages = ev_cli
-python_requires = >=3.7
+packages =
+    ev_cli
+    ev_coverage
+python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =
     ev-cli = ev_cli.ev:main
+    ev-coverage = ev_coverage.cov:main
 
 [options.package_data]
 ev_cli =
diff --git a/applications/utils/ev-dev-tools/src/ev_cli/__init__.py b/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
index d60b424fa8..5944dcf16d 100644
--- a/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
+++ b/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
@@ -1,2 +1,4 @@
 """EVerest command line utility."""
-__version__ = '0.7.3'
+from importlib.metadata import version
+
+__version__ = version('ev-dev-tools')
diff --git a/applications/utils/ev-dev-tools/src/ev_coverage/__init__.py b/applications/utils/ev-dev-tools/src/ev_coverage/__init__.py
new file mode 100644
index 0000000000..b5894c96a2
--- /dev/null
+++ b/applications/utils/ev-dev-tools/src/ev_coverage/__init__.py
@@ -0,0 +1,4 @@
+"""EVerest coverage utility."""
+from importlib.metadata import version
+
+__version__ = version('ev-dev-tools')
\ No newline at end of file
diff --git a/applications/utils/ev-dev-tools/src/ev_coverage/cov.py b/applications/utils/ev-dev-tools/src/ev_coverage/cov.py
new file mode 100644
index 0000000000..0f72026bde
--- /dev/null
+++ b/applications/utils/ev-dev-tools/src/ev_coverage/cov.py
@@ -0,0 +1,163 @@
+#!/bin/python3
+
+"""
+With this script, orphaned object (.o) and gcovr (gcno) files can be removed. This is especially necessary when branches
+are switched and there is an orphaned object / gcno file. gcovr will then give an error. When gcno and object files
+of the orphaned class are removed, gcovr will run fine.
+This script will also remove all gcda files from the given build directory.
+"""
+
+import os
+import glob
+import pathlib
+import argparse
+import shutil
+import subprocess
+import re
+from dataclasses import dataclass
+from ev_coverage import __version__
+
+
+@dataclass
+class RemovedFiles:
+    """Keeps track of the amount of deleted files of different categories."""
+    gcda: int
+    orphaned_object: int
+
+
+def log_wrapper(message: str, silent: bool):
+    if not silent:
+        print(f'{message}')
+
+
+def remove_wrapper(filepath: pathlib.Path, dry_run=True, silent=False):
+    if dry_run:
+        log_wrapper(f'(dry-run) did not remove: {filepath}', silent)
+        return
+    os.remove(filepath)
+
+
+def remove_all_gcda_files(build_dir: str, dry_run: bool, silent: bool) -> int:
+    log_wrapper('Removing all gcda files from build directory', silent)
+
+    dir = pathlib.Path(build_dir)
+    return len([remove_wrapper(f, dry_run, silent) for f in dir.rglob('*.gcda')])
+
+
+def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: bool, silent: bool) -> int:
+    log_wrapper('Removing orphaned object files and gcno files from build directory', silent)
+    # Find all object files (*.o) in the build directory
+    object_files = glob.glob(f'{build_dir}/**/*.o', recursive=True)
+    removed_files = 0
+
+    if not use_dwarfdump:
+        log_wrapper(
+            'Using GDB to check for object files. This is way slower than using dwarfdump. You can install dwarfdump '
+            '(llvm-dwarfdump) to speed up the process', False)
+
+    for obj_file in object_files:
+        cpp_file_exists = False
+
+        full_path = pathlib.PurePosixPath(obj_file)
+
+        # Get the base name of the object file (remove the path)
+        # obj_basename = os.path.basename(obj_file)
+        obj_basename = full_path.name
+        obj_dir = full_path.parent
+
+        # Convert the object file base name to the corresponding cpp file name
+        cpp_basename = obj_basename[:-2] \
+            if obj_basename.endswith('cpp.o') or obj_basename.endswith('c.o') or obj_basename.endswith('cc.o') \
+            else obj_basename.replace('.o', '.cpp')
+
+        if use_dwarfdump:
+            # if False:
+            # Get the source file belonging to the object file
+            command_dwarfdump = f'llvm-dwarfdump --show-sources {obj_file} | grep {cpp_basename}'
+            result = subprocess.run([command_dwarfdump], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
+                                    shell=True).stdout.decode('utf-8')
+
+            # This will return some information, which sometimes is just the file and sometimes a list of files,
+            # one per line. The latter should be split.
+            paths = re.split('\n', result)
+        else:
+            # Get the source file belonging to the object file
+            command = f'/usr/bin/gdb -q -ex "set height 0" -ex "info sources" -ex quit {obj_file} | grep {cpp_basename}'
+
+            result = subprocess.run([command], stdout=subprocess.PIPE, shell=True).stdout.decode('utf-8')
+
+            # This will return some information, including a comma separated list of files on one line. So this should
+            # be split.
+            paths = re.split('\n|,|:', result)
+            # Loop over all strings read from the gdb command, which includes paths. If the string ends with the name
+            # of the file, then it should be the source
+
+        for path in paths:
+            path = path.strip()
+            if path.endswith(cpp_basename) and os.path.isfile(path):
+                # Found path, do not remove!
+                cpp_file_exists = True
+                break
+
+        # If no corresponding .cpp file was found, remove the orphaned .o file
+        if not cpp_file_exists:
+            log_wrapper(f'Removing orphaned object file: {obj_file}', silent)
+            for p in pathlib.Path(obj_dir).glob(obj_basename + "*"):
+                # for p in pathlib.Path(build_dir).rglob(relative_path_cpp + '*'):
+                if os.path.isfile(p):
+                    log_wrapper(f'Removing other orphaned file: {p}', silent)
+                    remove_wrapper(p, dry_run, silent)
+                    removed_files += 1
+            # If obj file is not removed in the previous loop, remove it now
+            if os.path.isfile(obj_file):
+                log_wrapper(f'Removing object file: {obj_file}', silent)
+                remove_wrapper(obj_file, dry_run, silent)
+                removed_files += 1
+    return removed_files
+
+
+def remove_unnecessary_files(args):
+    use_dwarfdump = shutil.which('llvm-dwarfdump')
+    gdb_exists = shutil.which('gdb')
+
+    if not gdb_exists and not use_dwarfdump:
+        log_wrapper('GDB and dwarfdump do not exist. Install one of them to be able to run this script', False)
+        exit(-1)
+
+    removed_files = RemovedFiles(0, 0)
+    removed_files.gcda = remove_all_gcda_files(build_dir=args.build_dir, dry_run=args.dry_run, silent=args.silent)
+    removed_files.orphaned_object = remove_orphaned_object_files(
+        build_dir=args.build_dir, use_dwarfdump=use_dwarfdump, dry_run=args.dry_run, silent=args.silent)
+    if args.summary:
+        prefix = '(dry-run) Would have removed' if args.dry_run else 'Removed'
+        print(f'{prefix} {removed_files.gcda} .gcda files and {removed_files.orphaned_object} orphaned object files')
+
+    if not use_dwarfdump:
+        log_wrapper(
+            '\n === Did that take a longggg time? Install dwarfdump (llvm0-dwarfdump) to get quicker results '
+            'next time! === \n', False)
+
+
+def main():
+    parser = argparse.ArgumentParser('Everest coverage command line tools')
+    parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}')
+
+    subparsers = parser.add_subparsers(metavar='<command>', help='available commands', required=True)
+    parser_file_remover = subparsers.add_parser(
+        'remove_files', aliases=['rm'], help='Remove orphaned / unnecessary files')
+
+    parser_file_remover.add_argument('--build-dir', type=str, required=True, help='Build directory')
+    parser_file_remover.add_argument('--dry-run', required=False, action='store_true',
+                                     help='Dry run, does not remove any files', default=False)
+    parser_file_remover.add_argument('--summary', required=False, action='store_true',
+                                     help='Only show a summary of removed files', default=False)
+    parser_file_remover.add_argument('--silent', required=False, action='store_true',
+                                     help='Suppress all output, summary is still shown when requested', default=False)
+    parser_file_remover.set_defaults(action_handler=remove_unnecessary_files)
+    args = parser.parse_args()
+
+    args.action_handler(args)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/applications/utils/ev-dev-tools/version.txt b/applications/utils/ev-dev-tools/version.txt
new file mode 100644
index 0000000000..cb0c939a93
--- /dev/null
+++ b/applications/utils/ev-dev-tools/version.txt
@@ -0,0 +1 @@
+0.5.2

From ed48b4d757fd1e7e0353dd48e162bfdfbe61d6b6 Mon Sep 17 00:00:00 2001
From: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
Date: Wed, 27 Aug 2025 14:18:50 +0200
Subject: [PATCH 2/2] re-integrate coverage script with ev-cli

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
---
 applications/utils/ev-dev-tools/setup.cfg     |  4 +-
 .../utils/ev-dev-tools/src/ev_cli/__init__.py |  4 +-
 .../cov.py => ev_cli/coverage.py}             | 65 ++++++-------------
 .../utils/ev-dev-tools/src/ev_cli/ev.py       | 20 ++++++
 applications/utils/ev-dev-tools/version.txt   |  1 -
 5 files changed, 43 insertions(+), 51 deletions(-)
 rename applications/utils/ev-dev-tools/src/{ev_coverage/cov.py => ev_cli/coverage.py} (67%)
 delete mode 100644 applications/utils/ev-dev-tools/version.txt

diff --git a/applications/utils/ev-dev-tools/setup.cfg b/applications/utils/ev-dev-tools/setup.cfg
index 1d2ad11209..b673b80c59 100644
--- a/applications/utils/ev-dev-tools/setup.cfg
+++ b/applications/utils/ev-dev-tools/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ev-dev-tools
-version = file: version.txt
+version = attr: ev_cli.__version__
 author = aw, Maaike Zijderveld
 author_email = aw@pionix.de, maaike@pionix.de
 description = Utilities for developing with the everest framework
@@ -22,13 +22,11 @@ package_dir =
     = src
 packages =
     ev_cli
-    ev_coverage
 python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =
     ev-cli = ev_cli.ev:main
-    ev-coverage = ev_coverage.cov:main
 
 [options.package_data]
 ev_cli =
diff --git a/applications/utils/ev-dev-tools/src/ev_cli/__init__.py b/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
index 5944dcf16d..71513d987d 100644
--- a/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
+++ b/applications/utils/ev-dev-tools/src/ev_cli/__init__.py
@@ -1,4 +1,2 @@
 """EVerest command line utility."""
-from importlib.metadata import version
-
-__version__ = version('ev-dev-tools')
+__version__ = '0.6.2'
diff --git a/applications/utils/ev-dev-tools/src/ev_coverage/cov.py b/applications/utils/ev-dev-tools/src/ev_cli/coverage.py
similarity index 67%
rename from applications/utils/ev-dev-tools/src/ev_coverage/cov.py
rename to applications/utils/ev-dev-tools/src/ev_cli/coverage.py
index 0f72026bde..9c9e2bded2 100644
--- a/applications/utils/ev-dev-tools/src/ev_coverage/cov.py
+++ b/applications/utils/ev-dev-tools/src/ev_cli/coverage.py
@@ -1,6 +1,10 @@
-#!/bin/python3
-
+# -*- coding: utf-8 -*-
+#
+# SPDX-License-Identifier: Apache-2.0
+# Copyright Pionix GmbH and Contributors to EVerest
+#
 """
+author: maaike@pionix.de
 With this script, orphaned object (.o) and gcovr (gcno) files can be removed. This is especially necessary when branches
 are switched and there is an orphaned object / gcno file. gcovr will then give an error. When gcno and object files
 of the orphaned class are removed, gcovr will run fine.
@@ -9,13 +13,13 @@
 
 import os
 import glob
-import pathlib
+from pathlib import Path, PurePosixPath
 import argparse
 import shutil
 import subprocess
 import re
 from dataclasses import dataclass
-from ev_coverage import __version__
+# from ev_coverage import __version__
 
 
 @dataclass
@@ -30,24 +34,23 @@ def log_wrapper(message: str, silent: bool):
         print(f'{message}')
 
 
-def remove_wrapper(filepath: pathlib.Path, dry_run=True, silent=False):
+def remove_wrapper(filepath: Path, dry_run=True, silent=False):
     if dry_run:
         log_wrapper(f'(dry-run) did not remove: {filepath}', silent)
         return
     os.remove(filepath)
 
 
-def remove_all_gcda_files(build_dir: str, dry_run: bool, silent: bool) -> int:
+def remove_all_gcda_files(build_dir: Path, dry_run: bool, silent: bool) -> int:
     log_wrapper('Removing all gcda files from build directory', silent)
 
-    dir = pathlib.Path(build_dir)
-    return len([remove_wrapper(f, dry_run, silent) for f in dir.rglob('*.gcda')])
+    return len([remove_wrapper(f, dry_run, silent) for f in build_dir.rglob('*.gcda')])
 
 
-def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: bool, silent: bool) -> int:
+def remove_orphaned_object_files(build_dir: Path, use_dwarfdump: bool, dry_run: bool, silent: bool) -> int:
     log_wrapper('Removing orphaned object files and gcno files from build directory', silent)
     # Find all object files (*.o) in the build directory
-    object_files = glob.glob(f'{build_dir}/**/*.o', recursive=True)
+    object_files = glob.glob(f'{build_dir.as_posix()}/**/*.o', recursive=True)
     removed_files = 0
 
     if not use_dwarfdump:
@@ -58,7 +61,7 @@ def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: b
     for obj_file in object_files:
         cpp_file_exists = False
 
-        full_path = pathlib.PurePosixPath(obj_file)
+        full_path = PurePosixPath(obj_file)
 
         # Get the base name of the object file (remove the path)
         # obj_basename = os.path.basename(obj_file)
@@ -71,7 +74,6 @@ def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: b
             else obj_basename.replace('.o', '.cpp')
 
         if use_dwarfdump:
-            # if False:
             # Get the source file belonging to the object file
             command_dwarfdump = f'llvm-dwarfdump --show-sources {obj_file} | grep {cpp_basename}'
             result = subprocess.run([command_dwarfdump], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
@@ -102,7 +104,7 @@ def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: b
         # If no corresponding .cpp file was found, remove the orphaned .o file
         if not cpp_file_exists:
             log_wrapper(f'Removing orphaned object file: {obj_file}', silent)
-            for p in pathlib.Path(obj_dir).glob(obj_basename + "*"):
+            for p in Path(obj_dir).glob(obj_basename + "*"):
                 # for p in pathlib.Path(build_dir).rglob(relative_path_cpp + '*'):
                 if os.path.isfile(p):
                     log_wrapper(f'Removing other orphaned file: {p}', silent)
@@ -116,48 +118,23 @@ def remove_orphaned_object_files(build_dir: str, use_dwarfdump: bool, dry_run: b
     return removed_files
 
 
-def remove_unnecessary_files(args):
+def remove_unnecessary_files(build_dir: Path, dry_run: bool, summary: bool, silent: bool) -> bool:
     use_dwarfdump = shutil.which('llvm-dwarfdump')
     gdb_exists = shutil.which('gdb')
 
     if not gdb_exists and not use_dwarfdump:
         log_wrapper('GDB and dwarfdump do not exist. Install one of them to be able to run this script', False)
-        exit(-1)
+        return False
 
     removed_files = RemovedFiles(0, 0)
-    removed_files.gcda = remove_all_gcda_files(build_dir=args.build_dir, dry_run=args.dry_run, silent=args.silent)
+    removed_files.gcda = remove_all_gcda_files(build_dir=build_dir, dry_run=dry_run, silent=silent)
     removed_files.orphaned_object = remove_orphaned_object_files(
-        build_dir=args.build_dir, use_dwarfdump=use_dwarfdump, dry_run=args.dry_run, silent=args.silent)
-    if args.summary:
-        prefix = '(dry-run) Would have removed' if args.dry_run else 'Removed'
+        build_dir=build_dir, use_dwarfdump=use_dwarfdump, dry_run=dry_run, silent=silent)
+    if summary:
+        prefix = '(dry-run) Would have removed' if dry_run else 'Removed'
         print(f'{prefix} {removed_files.gcda} .gcda files and {removed_files.orphaned_object} orphaned object files')
 
     if not use_dwarfdump:
         log_wrapper(
             '\n === Did that take a longggg time? Install dwarfdump (llvm0-dwarfdump) to get quicker results '
             'next time! === \n', False)
-
-
-def main():
-    parser = argparse.ArgumentParser('Everest coverage command line tools')
-    parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}')
-
-    subparsers = parser.add_subparsers(metavar='<command>', help='available commands', required=True)
-    parser_file_remover = subparsers.add_parser(
-        'remove_files', aliases=['rm'], help='Remove orphaned / unnecessary files')
-
-    parser_file_remover.add_argument('--build-dir', type=str, required=True, help='Build directory')
-    parser_file_remover.add_argument('--dry-run', required=False, action='store_true',
-                                     help='Dry run, does not remove any files', default=False)
-    parser_file_remover.add_argument('--summary', required=False, action='store_true',
-                                     help='Only show a summary of removed files', default=False)
-    parser_file_remover.add_argument('--silent', required=False, action='store_true',
-                                     help='Suppress all output, summary is still shown when requested', default=False)
-    parser_file_remover.set_defaults(action_handler=remove_unnecessary_files)
-    args = parser.parse_args()
-
-    args.action_handler(args)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/applications/utils/ev-dev-tools/src/ev_cli/ev.py b/applications/utils/ev-dev-tools/src/ev_cli/ev.py
index 4d9f546e33..b17921cd47 100755
--- a/applications/utils/ev-dev-tools/src/ev_cli/ev.py
+++ b/applications/utils/ev-dev-tools/src/ev_cli/ev.py
@@ -13,6 +13,7 @@
 from ev_cli import helpers
 from ev_cli.type_parsing import TypeParser
 from ev_cli.error_parsing import ErrorParser
+from ev_cli import coverage
 
 from datetime import datetime
 from pathlib import Path
@@ -735,6 +736,11 @@ def types_get_templates(args):
     print(f'{interface_files}')
 
 
+def coverage_remove_files(args):
+    print(f'args: {args}')
+    coverage.remove_unnecessary_files(build_dir=Path(args.build_dir), dry_run=args.dry_run, summary=args.summary, silent=args.silent)
+
+
 def main():
     global validators, everest_dirs, work_dir
 
@@ -770,6 +776,7 @@ def main():
     parser_if = subparsers.add_parser('interface', aliases=['if'], help='interface related actions')
     parser_hlp = subparsers.add_parser('helpers', aliases=['hlp'], help='helper actions')
     parser_types = subparsers.add_parser('types', aliases=['ty'], help='type related actions')
+    parser_coverage = subparsers.add_parser('coverage', aliases=['cov'], help='coverage related actions')
 
     mod_actions = parser_mod.add_subparsers(metavar='<action>', help='available actions', required=True)
     mod_create_parser = mod_actions.add_parser('create', aliases=['c'], parents=[
@@ -841,6 +848,19 @@ def main():
                                      'will be skipped')
     types_genhdr_parser.set_defaults(action_handler=types_genhdr)
 
+    coverage_actions = parser_coverage.add_subparsers(metavar='<action>', help='available actions', required=True)
+    parser_file_remover = coverage_actions.add_parser(
+        'remove_files', aliases=['rm'], help='Remove orphaned / unnecessary files')
+
+    parser_file_remover.add_argument('--build-dir', type=str, required=True, help='Build directory')
+    parser_file_remover.add_argument('--dry-run', required=False, action='store_true',
+                                     help='Dry run, does not remove any files', default=False)
+    parser_file_remover.add_argument('--summary', required=False, action='store_true',
+                                     help='Only show a summary of removed files', default=False)
+    parser_file_remover.add_argument('--silent', required=False, action='store_true',
+                                     help='Suppress all output, summary is still shown when requested', default=False)
+    parser_file_remover.set_defaults(action_handler=coverage_remove_files)
+
     for sub_parser, get_template_function in [
         (mod_actions, module_get_templates),
         (if_actions, interface_get_templates),
diff --git a/applications/utils/ev-dev-tools/version.txt b/applications/utils/ev-dev-tools/version.txt
deleted file mode 100644
index cb0c939a93..0000000000
--- a/applications/utils/ev-dev-tools/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.5.2