Skip to content

Add CATKIN_IGNORE_ROS2 marker support for mixed ROS1/ROS2 workspaces #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add CATKIN_IGNORE_ROS2 marker support for mixed ROS1/ROS2 workspaces #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions catkin_tools/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,16 +522,21 @@ def wide_log(msg, **kwargs):


def find_packages(*args, **kwargs):
"""
Crawls the filesystem to find package manifest files. Ignores subfolders if CATKIN_IGNORE is present.
"""Crawls the filesystem to find package manifest files.

Ignores subfolders if CATKIN_IGNORE or CATKIN_IGNORE_ROS2 is present.

:param basepath: The path to search in, ``str``
:param exclude_paths: A list of paths which should not be searched, ``list``
:param exclude_subspaces: The flag is subfolders containing a .catkin file should not be
searched, ``bool``
:param ignore_markers: A set of filenames to be used as ignore markers, ``set``
:returns: A list of relative paths containing package manifest files ``list``
"""
return _find_packages(*args, ignore_markers={'CATKIN_IGNORE'}, **kwargs)
return _find_packages(
*args,
ignore_markers={'CATKIN_IGNORE', 'CATKIN_IGNORE_ROS2'},
**kwargs)


def find_enclosing_package(search_start_path=None, ws_path=None, warnings=None, symlinks=True):
Expand Down
7 changes: 4 additions & 3 deletions catkin_tools/verbs/catkin_clean/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,10 @@ def prepare_arguments(parser):
add('--dependents', '--deps', action='store_true', default=False,
help='Clean the packages which depend on the packages to be cleaned.')
add('--orphans', action='store_true', default=False,
help='Remove products from packages are no longer in the source space. '
'Note that this also removes packages which are '
'skiplisted or which contain `CATKIN_IGNORE` marker files.')
help='Remove products from packages are no longer in the source '
'space. Note that this also removes packages which are skiplisted '
'or which contain `CATKIN_IGNORE` or `CATKIN_IGNORE_ROS2` marker '
'files.')

# Advanced group
advanced_group = parser.add_argument_group(
Expand Down
Loading