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

[foxy-backport] fast forward of ros2 (default) to foxy #570

Merged
merged 7 commits into from
Jun 23, 2020
Merged

[foxy-backport] fast forward of ros2 (default) to foxy #570

merged 7 commits into from
Jun 23, 2020

Conversation

wjwwood
Copy link
Member

@wjwwood wjwwood commented Jun 23, 2020

I went over the pull requests merged since the foxy release, and I believe all of them are ok from an ABI perspective. There were some build system changes, but I believe they should be backwards compatible, but I'm not 100% sure of that.

I'll for feedback on that point for some of the individual commits, but here is a list of all of them:

@jacobperron FYI

dirk-thomas and others added 7 commits June 4, 2020 20:59
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
This removes one more warning from rviz_common builds.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
…y cross platform (#565)

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Signed-off-by: ymd-stella <world.applepie@gmail.com>
Signed-off-by: Karsten Knese <karsten@openrobotics.org>
* Don't install test header files in rviz_rendering.

This change started as a relatively simple try at not installing
test includes when installing rviz_rendering.  As you can see,
it ballooned into quite a large change, so here is an explanation
of why.

We shouldn't install test include header files when installing
the package; that just ends up on the end user system, and
is a non-supported API.  Worse, we don't want to compile test
code in our main library.  Yet rviz_rendering is currently doing
both of these things.

Unfortunately, it is somewhat tricky to make that code and header
file private.  The problem is that that test code is used in
rviz_rendering, rviz_common, rviz_default_plugins, and
rviz_rendering_tests.

One solution might be to extract that test code into its own
package, and then have all of the other packages depend on it.
The problem is that that test package would both be depended
on by rviz_rendering (for tests), and depends itself on rviz_rendering
(for its functionality), creating a dependency loop.

The solution I opted for here is to copy the test code into the
appropriate packages.  This leads to some duplication of functionality,
but it effectively breaks the dependency loop and succeeds in
eliminating the test code from our installed library.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Copy link
Contributor

@Karsten1987 Karsten1987 left a comment

Choose a reason for hiding this comment

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

I'll give thumbs up for my commits at least. But just for my understanding:
#567 should be closed in favor of this PR then, right? Also, I thought it was on the project board. But maybe I missed something here.

@wjwwood
Copy link
Member Author

wjwwood commented Jun 23, 2020

Sorry, I didn't see that. Yeah I will close #567 in favor of this one if all of the commits are ok.

I think it's helpful for the original issue/pull request to be in the "needs backport" column until it is released into foxy. But that's just my take.

@clalancette
Copy link
Contributor

Don't install test header files in rviz_rendering. (#564)

* @clalancette should this one be back ported? It was not on the back port project

* it seems like the most risky of the group, but it also (after reading it again) seems safe, as we never intended people to use the test headers which had been installed

I'm on the fence about it. It should be relatively harmless, but as you say, it is the riskiest of the group. If you think that the benefit of being able to cherry-pick commits between ros2 and foxy outweigh the (pretty small) potential for regression, I'd say go for it. I mostly didn't put it on the backport project since I am very conservative about backporting.

@wjwwood
Copy link
Member Author

wjwwood commented Jun 23, 2020

Ok, @jacobperron do you have an opinion?

Copy link
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

A fast-forward is okay by me.

The potential for a regression due to #564 seems relatively low considering it is touching test files.

@wjwwood
Copy link
Member Author

wjwwood commented Jun 23, 2020

Ok, I'll do the fast-forward then.

@wjwwood wjwwood merged commit 594ba20 into foxy Jun 23, 2020
@delete-merged-branch delete-merged-branch bot deleted the ros2 branch June 23, 2020 22:16
@wjwwood
Copy link
Member Author

wjwwood commented Jun 23, 2020

Because there's a header that was moved to public from private and therefore adds API:

https://github.com/ros2/rviz/pull/564/files#diff-608c586d26f0d375668eb4e5e1e4acfc

I think I'll do a minor version bump.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants