Skip to content

Allow sharing of cargo target directory between builds #71

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
cottsay wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow sharing of cargo target directory between builds #71

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
24 changes: 15 additions & 9 deletions colcon_cargo/task/cargo/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from colcon_cargo.task.cargo import CARGO_EXECUTABLE
from colcon_core.environment import create_environment_scripts
from colcon_core.feature_flags import is_feature_flag_set
from colcon_core.logging import colcon_logger
from colcon_core.plugin_system import satisfies_version
from colcon_core.shell import create_environment_hook, get_command_environment
Expand Down Expand Up @@ -58,12 +59,18 @@ async def build( # noqa: D102
return rc

# Clean up the build dir
build_dir = Path(args.build_base)
if args.clean_build:
if build_dir.is_symlink():
build_dir.unlink()
elif build_dir.exists():
shutil.rmtree(build_dir)
self._build_dir = Path(args.build_base)
if is_feature_flag_set('shared_cargo_target_dir'):
self._build_dir = self._build_dir.parent / '.cargo_target'
if args.clean_build:
logger.warning(
"The '--clean-build' argument has no effect when using "
"'shared_cargo_target_dir'")
elif args.clean_build:
if self._build_dir.is_symlink():
self._build_dir.unlink()
elif self._build_dir.exists():
shutil.rmtree(self._build_dir)

if CARGO_EXECUTABLE is None:
raise RuntimeError("Could not find 'cargo' executable")
Expand Down Expand Up @@ -111,14 +118,13 @@ def _prepare(self, env, additional_hooks):

# Overridden by colcon-ros-cargo
def _build_cmd(self, cargo_args):
args = self.context.args
pkg = self.context.pkg
cmd = [
CARGO_EXECUTABLE,
'build',
'--quiet',
'--package', pkg.name,
'--target-dir', args.build_base,
'--target-dir', str(self._build_dir),
]
if not any(
arg == '--profile' or arg.startswith('--profile=')
Expand All @@ -138,7 +144,7 @@ def _install_cmd(self, cargo_args):
'--locked',
'--path', '.',
'--root', args.install_base,
'--target-dir', args.build_base,
'--target-dir', str(self._build_dir),
'--no-track',
]
if not any(
Expand Down
Loading