Skip to content

Commit

Permalink
Support ROS Melodic (#514)
Browse files Browse the repository at this point in the history
* Support ROS Melodic
* Remove Jade and add Melodic to documentation/CI
  • Loading branch information
pjreed committed May 11, 2018
1 parent 4c379d0 commit c6a93b1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
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
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)
-------------

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
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
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
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

0 comments on commit c6a93b1

Please sign in to comment.