Skip to content

Commit

Permalink
Consolidate ar_track_alvar* packages into a single repo (sniekum#120)
Browse files Browse the repository at this point in the history
* Add meta pkg. Move ar_track_alvar_msgs package.

* [msgs] Adjust version so that we can release the package at once within the metapkg.

Currently, ar_track_alvar consists of 2 packages, `ar_track_alvar` and `ar_track_alvar_msgs`. These are maintained in two separate repositories, which duplicates release tasks. These two packages can easily be maintained in a single repo and maintenance can be reduced. Backward compatibility should be perfectly retained since we're not changing anything in 2 existing packages.

To list the actual change:
- Add a metapkg `ar_track_alvar_metapkg`
- Move ar_track_alvar_msgs` from [the separate repo](https://github.com/sniekum/ar_track_alvar_msgs) into this repo.

* [CI] Add ROS Lunar, and allow them to fail since the dependency might not be fulfilled yet before its official release.

* Update readme and .rosinstall files.
  • Loading branch information
130s authored Apr 20, 2017
1 parent 722639c commit b32295f
Show file tree
Hide file tree
Showing 188 changed files with 102 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ env:
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true NOT_TEST_INSTALL=true
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu USE_DEB=true NOT_TEST_INSTALL=true VERBOSE_OUTPUT='true'
- ROS_DISTRO="kinetic" PRERELEASE=true
- ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true NOT_TEST_INSTALL=true
- ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu USE_DEB=true NOT_TEST_INSTALL=true VERBOSE_OUTPUT='true'
- ROS_DISTRO="lunar" PRERELEASE=true
matrix:
allow_failures:
- env: ROS_DISTRO="kinetic" PRERELEASE=true
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true NOT_TEST_INSTALL=true
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu USE_DEB=true NOT_TEST_INSTALL=true VERBOSE_OUTPUT='true'
- env: ROS_DISTRO="lunar" PRERELEASE=true
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config

Expand Down
6 changes: 1 addition & 5 deletions README
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ar_track_alvar
Package maintained by Scott Niekum
[email protected]
[email protected]

See [ROS wiki](http://wiki.ros.org/ar_track_alvar) for the users document.


4 changes: 2 additions & 2 deletions ar_track_alvar.rosinstall
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- git: {local-name: ar_track_alvar, uri: 'https://github.com/sniekum/ar_track_alvar.git', version: indigo-devel}
- git: {local-name: ar_track_alvar_msgs, uri: 'https://github.com/sniekum/ar_track_alvar_msgs.git', version: indigo-devel}
- git: {local-name: ar_track_alvar_metapkg, uri: 'https://github.com/sniekum/ar_track_alvar.git', version: indigo-devel}

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions ar_track_alvar_metapkg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
project(ar_track_alvar_metapkg)
find_package(catkin REQUIRED)
catkin_metapackage()
18 changes: 18 additions & 0 deletions ar_track_alvar_metapkg/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<package>
<name>ar_track_alvar_metapkg</name>
<version>0.6.3</version>
<description>Meta package for ROS ar_track_alvar related packages.</description>

<author email="[email protected]">Isaac I.Y. Saito</author>
<maintainer email="[email protected]">Isaac I.Y. Saito</maintainer>
<license>LGPL-2.1</license>
<url type="website">http://ros.org/wiki/ar_track_alvar</url>

<buildtool_depend>catkin</buildtool_depend>
<run_depend>ar_track_alvar</run_depend>
<run_depend>ar_track_alvar_msgs</run_depend>
<export>
<metapackage />
</export>
</package>
18 changes: 18 additions & 0 deletions ar_track_alvar_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package ar_track_alvar_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.5.2 (2017-04-20)
------------------
* Add CI config. Update maintainer. `#2 <https://github.com/sniekum/ar_track_alvar_msgs/issues/2>`_
* Contributors: Scott Niekum, Isaac I.Y. Saito

0.5.1 (2015-04-12)
------------------
* Release into Jade ROS
* Contributors: Isaac IY Saito

0.5.0 (2014-06-25)
------------------
* migrate from ar_track_alvar repository
* Contributors: Jihoon Lee
18 changes: 18 additions & 0 deletions ar_track_alvar_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
cmake_minimum_required(VERSION 2.8.3)
project(ar_track_alvar_msgs)

set(MSG_DEPS
std_msgs
geometry_msgs
)

find_package(catkin REQUIRED COMPONENTS
message_generation
${MSG_DEPS}
)

set(MSG_FILES AlvarMarker.msg AlvarMarkers.msg)
add_message_files(DIRECTORY msg FILES ${MSG_FILES})
generate_messages(DEPENDENCIES ${MSG_DEPS})

catkin_package(CATKIN_DEPENDS message_runtime ${MSG_DEPS})
7 changes: 7 additions & 0 deletions ar_track_alvar_msgs/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ar_track_alvar_msgs
Package maintained by Scott Niekum
[email protected]
[email protected]



1 change: 1 addition & 0 deletions ar_track_alvar_msgs/msg/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cpp/
5 changes: 5 additions & 0 deletions ar_track_alvar_msgs/msg/AlvarMarker.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Header header
uint32 id
uint32 confidence
geometry_msgs/PoseStamped pose

2 changes: 2 additions & 0 deletions ar_track_alvar_msgs/msg/AlvarMarkers.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Header header
AlvarMarker[] markers
20 changes: 20 additions & 0 deletions ar_track_alvar_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package>
<name>ar_track_alvar_msgs</name>
<version>0.6.3</version>
<description>
This package is a ROS wrapper for Alvar, an open source AR tag tracking library.
</description>
<maintainer email="[email protected]">Scott Niekum</maintainer>
<maintainer email="[email protected]">Isaac I.Y. Saito</maintainer>
<license>BSD</license>
<url type="website">http://ros.org/wiki/ar_track_alvar</url>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>message_generation</build_depend>
<build_depend>geometry_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<run_depend>message_runtime</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>std_msgs</run_depend>
</package>

0 comments on commit b32295f

Please sign in to comment.