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.

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

Added 'catkin_make' support to CatkinResourceRetriever #14

Merged
merged 11 commits into from
Feb 27, 2016

Conversation

mkoval
Copy link
Member

@mkoval mkoval commented Feb 21, 2016

This pull request modifies CatkinResourceRetriever to locate Catkin packages by recursively searching the source space for package.xml files. This adds support for two important features:

  1. support for devel spaces generated by catkin_make
  2. support for packages named differently than their enclosing directory

I added unit tests for both catkin_make and catkin build style workspaces.

@psigen
Copy link
Member

psigen commented Feb 22, 2016

I'm assuming you assigned me to review this?

@mkoval
Copy link
Member Author

mkoval commented Feb 22, 2016

Yup. I probably shouldn't review my own pull request. 😄

@psigen
Copy link
Member

psigen commented Feb 22, 2016

Would it make sense to put a CATKIN_IGNORE in one of the parent directories of the test workspace path so that the test packages don't get crawled if someone just checks the code out into their workspace? Or can we depend on the "no recursive package.xml" rule?

@mkoval
Copy link
Member Author

mkoval commented Feb 22, 2016

Good question. In theory, we can rely on the "no recursive package.xml files" rule. I tested this with roscd and it seems to be true - I couldn't roscd my_package1.


static constexpr auto WORKSPACE_PATH = STR(AIKIDO_TEST_WORKSPACE_PATH);

static testing::AssertionResult CompareResourceContents(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you comment what this function does?

@psigen
Copy link
Member

psigen commented Feb 22, 2016

Looks pretty good overall, but I can't compile it until I fix some unrelated issues in my DART build.
Nice unit tests.

@mkoval
Copy link
Member Author

mkoval commented Feb 22, 2016

I believe I resolved all of your comments.

@mkoval mkoval mentioned this pull request Feb 22, 2016
@psigen psigen mentioned this pull request Feb 24, 2016
@psigen
Copy link
Member

psigen commented Feb 24, 2016

Oh, as I was pulling this version to test, I found that I already had a local version of bugfix/catkin_cmake. Guess I found my implemetation 😓.

@mkoval
Copy link
Member Author

mkoval commented Feb 24, 2016

@psigen Were you able to test this version? Are you satisfied with the pull request? 😄

@psigen
Copy link
Member

psigen commented Feb 27, 2016

Yeah, seems to work for me.

mkoval added a commit that referenced this pull request Feb 27, 2016
Added 'catkin_make' support to CatkinResourceRetriever.
@mkoval mkoval merged commit 22576e2 into master Feb 27, 2016
@mkoval mkoval deleted the bugfix/catkin_make branch February 27, 2016 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants