Consistently use importdir as patch location #128
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are using autoproj/autobuild to organize our ROS2 workspaces (for aup/osdeps).
Often ROS2 repos contain several packages instead of only one.
We (hackily) archieve the compatibility of these packages by setting a common importdir and defining
interactive: true
in the source.yml to prevent parallel checkouts into the same folder.
But patching these packages fails because autobuild places the patches in the importdir, but then searches for them in the srcdir, which is not the same in our case.
This PR fixes the behavior by consistently using the importdir as patch location.
For more information about the multi-package repo handling we are using:
The complete package_set (work in progress) :https://github.com/dfki-ric/ros2-package_set
Package definition: https://github.com/dfki-ric/ros2-package_set/blob/master/ros-2.autobuild#L21-L22
Source definition: https://github.com/dfki-ric/ros2-package_set/blob/master/source.yml#L85-L87
Package Type Definition: https://github.com/dfki-ric/ros2-package_set/blob/master/lib/colcon_package.rb
FYI: There is also support for the import of rock packages and generic libs into the colcon workspace to be directly build with colcon (set up pkg-config, generate package.xml, setting cmake_args from the autobuild file)