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

move pluginlib in its own folder (port 83 to ros2 branch) #95

Merged
merged 3 commits into from Dec 22, 2017

Conversation

mikaelarguedas
Copy link
Member

No description provided.

@mikaelarguedas
Copy link
Member Author

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

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

+1 for merge

I guess it would have been nice to rebase the ros2 branch instead, but now that we’ve made a release from it we probably shouldn’t do anything that doesn’t fast-forward. Later might have to make a commit to bring it back in step completely with melodic development and then readd the ros2 specific stuff. Oh well we can figure that out later.

@mikaelarguedas
Copy link
Member Author

Ok I updated and manually ported the parts of the PRs recently merged in melodic:
#83, #84, #88

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@mikaelarguedas
Copy link
Member Author

Note: I haven't fixed one set of uncrustify errors as I'm not convinced uncrustify does the right thing here:

--- pluginlib/include/pluginlib/impl/filesystem_helper.hpp
+++ pluginlib/include/pluginlib/impl/filesystem_helper.hpp.uncrustify
@@ -39 +39 @@
-#if __has_include(<filesystem>)
+#if __has_include(< filesystem >)
@@ -51 +51 @@
-#elif __has_include(<experimental/filesystem>)
+#elif __has_include(< experimental / filesystem >)

@mikaelarguedas mikaelarguedas merged commit 91b1a10 into ros2 Dec 22, 2017
@mikaelarguedas mikaelarguedas deleted the ros2_pluginlib_subfolder branch December 22, 2017 02:45
wjwwood added a commit that referenced this pull request Feb 8, 2018
* remove references to plugin_tool from CMakeLists (#93)

* move pluginlib in its own folder (port 83 to ros2 branch) (#95)

* move pluginlib in its own folder (port 83 to ros2 branch)

* fix most linter errors

* forward port of #88

Continue loading classes on error

* vs2015 doesnt support __has_include, VS2015 and 2017 have both <files… (#96)

* windows contains older version of std filesystem

* either <experimental/filesystem> or <filesystem> will work ... use experimental to be namespace-consistent

* vs2015 doesnt support __has_include, VS2015 and 2017 have both <filesystem> and <experimental/filesystem> but use std::experimental::filesystem in both cases

* adjust library search to work on windows, warn about lib prefix (#97)
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.

None yet

2 participants