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.

Sign up for GitHub

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

Jump to bottom

Support ROS Melodic #514

Merged
merged 2 commits into from
May 11, 2018
Merged

Support ROS Melodic #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27a6b8
Support ROS Melodic
pjreed May 11, 2018
afec4f4
Remove Jade and add Melodic to documentation/CI
pjreed May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ jobs:
include:
- stage: build-shadow-fixed
env: ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="melodic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- stage: build-released
env: ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="melodic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- stage: lint
sudo: false
install: pip install --user -q catkin-lint
script: catkin_lint -W2 --explain .
env: JOB="catkin_lint"
allow_failures:
- env: ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="melodic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: JOB="catkin_lint"
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ marti\_common [![Build Status](https://travis-ci.org/swri-robotics/marti_common.

This repository provides various utility packages created at [Southwest Reseach Institute](http://www.swri.org)'s [Intelligent Vehicle Systems](http://www.swri.org/4org/d10/isd/ivs/default.htm) section for working with [Robot Operating System(ROS)](http://www.ros.org).

Installation (ROS Indigo, Jade, Kinetic, Lunar)
Installation (ROS Indigo, Kinetic, Lunar, Melodic)
Copy link
Contributor

Choose a reason for hiding this comment

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

You could have kept Jade in there, unless OSRF is no longer hosting the repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think they're still hosting it, but it's been past EOL for a year now, they're no longer accepting releases into it, and I'm not planning to fix it if something breaks. I didn't want to give a misleading impression that we were still supporting it, although I suppose it's not a big deal either way. Do you think it's worth leaving in there?

Copy link
Contributor

Choose a reason for hiding this comment

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

🤷‍♂️

-------------

If you have installed ROS Indigo, Jade, Kinetic, or Lunar, you can install any of the packages in this repository with apt-get:
If you have installed ROS Indigo, Kinetic, Lunar, or Melodic, you can install any of the packages in this repository with apt-get:

sudo apt-get install ros-${ROS_DISTRO}-<package>

Building From Source (ROS Indigo, Jade, Kinetic, Lunar)
Building From Source (ROS Indigo, Kinetic, Lunar, Melodic)
------------

These directions assume you have already set up a catkin workspace and rosdep. See [this tutorial](http://wiki.ros.org/catkin/Tutorials/create_a_workspace) on the ROS Wiki for help setting up a catkin workspace and the [rosdep documentation](http://wiki.ros.org/rosdep) on the ROS wiki for help setting up rosdep.
Expand Down
4 changes: 4 additions & 0 deletions swri_opencv_util/src/show.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ namespace swri_opencv_util
}
}

#if (BOOST_VERSION / 100 % 1000) >= 65
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh wow this is actually the supported way of detecting the boost version. Eww.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that's the same face I made. Oh, boost.

friend class boost::serialization::singleton<CvWindows>;
#else
friend class boost::serialization::detail::singleton_wrapper<CvWindows>;
#endif
private:
CvWindows() {}
boost::mutex mutex_;
Expand Down
4 changes: 4 additions & 0 deletions swri_transform_util/include/swri_transform_util/utm_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ namespace swri_transform_util
int zone, char band, double easting, double northing,
double& latitude, double& longitude) const;

#if (BOOST_VERSION / 100 % 1000) >= 65
friend class boost::serialization::singleton<swri_transform_util::UtmUtil::UtmData>;
#else
friend class boost::serialization::detail::singleton_wrapper<swri_transform_util::UtmUtil::UtmData>;
#endif
private:
UtmData();

Expand Down