Skip to content
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

Add a blacklist option to make_isolated #1027

Merged
merged 4 commits into from
Aug 14, 2019
Merged

Add a blacklist option to make_isolated #1027

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06b134e
add make_isolated blacklist option
artivis Aug 14, 2019
0bb79cb
fix var naming & no split
artivis Aug 14, 2019
bf92361
fix
artivis Aug 14, 2019
16e9f20
rm useless val
artivis Aug 14, 2019
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
3 changes: 3 additions & 0 deletions bin/catkin_make_isolated
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def parse_args(args=None):
pkg.add_argument('--pkg', nargs='+', metavar='PKGNAME', dest='packages',
help="Process only specific packages "
"(only after catkin_make_isolated has been invoked before with the same install flag)")
pkg.add_argument('--ignore-pkg', nargs='+', metavar='PKGNAME', dest='ignore_packages',
help="Ignore specific packages.")
pkg.add_argument('--from-pkg', metavar='PKGNAME', dest='from_package',
help='Restart catkin_make_isolated at the given package continuing from there '
'(do not change CMake arguments, add/move/remove packages or toggle the install flag when '
Expand Down Expand Up @@ -146,6 +148,7 @@ def main():
force_cmake=opts.force_cmake,
colorize=not opts.no_color,
build_packages=opts.packages or ([] if opts.from_package is None else [opts.from_package]),
blacklisted=opts.ignore_packages,
quiet=opts.quiet,
cmake_args=cmake_args,
make_args=opts.make_args,
Expand Down
3 changes: 2 additions & 1 deletion python/catkin/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,7 @@ def build_workspace_isolated(
force_cmake=False,
colorize=True,
build_packages=None,
ignore_packages=None,
quiet=False,
cmake_args=None,
make_args=None,
Expand Down Expand Up @@ -971,7 +972,7 @@ def build_workspace_isolated(
sys.exit('Packages not found in the workspace: %s' % ', '.join(unknown_packages))

# Report topological ordering
ordered_packages = topological_order_packages(packages)
ordered_packages = topological_order_packages(packages, whitelisted=None, blacklisted=ignore_packages)
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
unknown_build_types = []
msg = []
msg.append('@{pf}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~' + ('~' * len(str(len(ordered_packages)))))
Expand Down