Skip to content

[kinetic] backport rearrange chomp modules for maintainability #1251#1282

Merged
v4hn merged 8 commits intokinetic-develfrom
pr-kinetic-backport-move-chomp
Jan 11, 2019
Merged

[kinetic] backport rearrange chomp modules for maintainability #1251#1282
v4hn merged 8 commits intokinetic-develfrom
pr-kinetic-backport-move-chomp

Conversation

@v4hn
Copy link
Copy Markdown
Contributor

@v4hn v4hn commented Dec 21, 2018

As proposed by @rhaschke in #1251 (comment)

I had to address a few conflicts.

I also included #1256 .

@v4hn v4hn force-pushed the pr-kinetic-backport-move-chomp branch from 8026d48 to 1ebdec0 Compare December 21, 2018 16:26

set(VERSION_FILE_PATH "${CATKIN_DEVEL_PREFIX}/include")
file(MAKE_DIRECTORY "${VERSION_FILE_PATH}")
#find_package(Boost REQUIRED system filesystem date_time thread iostreams)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is it worth adding a note here and in the package.xml about why this is commented out?

rhaschke and others added 8 commits January 1, 2019 20:32
- mv collision_distance_field from moveit_experimental to moveit_planners/chomp
- mv chomp_optimizer_adapter.cpp into own package in moveit_planners/chomp
... and removed collision_detector_hybrid_plugin_loader
Currently, there is nothing built in moveit_experimental
... to enforce installing the empty moveit_experimental first
@rhaschke rhaschke force-pushed the pr-kinetic-backport-move-chomp branch from 2eff205 to 616ba92 Compare January 1, 2019 19:33
@rhaschke
Copy link
Copy Markdown
Contributor

rhaschke commented Jan 1, 2019

@v4hn Is there a special reason that you didn't removed collision_detector_hybrid_plugin_loader.h?

@rhaschke
Copy link
Copy Markdown
Contributor

rhaschke commented Jan 1, 2019

I also added a dependency from moveit_core to moveit_experimental to ensure that the latter (empty one) is installed first.

@rhaschke
Copy link
Copy Markdown
Contributor

Ping @v4hn: If you also agree to remove collision_detector_hybrid_plugin_loader.h (0d47fca), we can merge this.

@v4hn
Copy link
Copy Markdown
Contributor Author

v4hn commented Jan 11, 2019

Apparently I just failed to see the header was still there @rhaschke.
There was no special reason to keep it.

I will merge this now.

--

edit: The additional run_depend will be superfluous again later, so we probably want to remove it again next time we change the main branch.

@v4hn v4hn merged commit 5a77af4 into kinetic-devel Jan 11, 2019
@rhaschke rhaschke deleted the pr-kinetic-backport-move-chomp branch January 14, 2019 11:18
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.

3 participants