Skip to content

Commit

Permalink
convert package from rosbuild to catkin
Browse files Browse the repository at this point in the history
  • Loading branch information
astraw committed Nov 27, 2016
1 parent 287d18f commit 5dbcfe5
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 36 deletions.
23 changes: 16 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
cmake_minimum_required(VERSION 2.8)
project(ros_flydra)

rosbuild_init()
find_package(catkin REQUIRED message_generation sensor_msgs geometry_msgs)

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
add_message_files()
add_service_files()

rosbuild_genmsg()
rosbuild_gensrv()
catkin_python_setup()

generate_messages(DEPENDENCIES sensor_msgs geometry_msgs)

catkin_package(
CATKIN_DEPENDS message_runtime sensor_msgs geometry_msgs
)

catkin_install_python(PROGRAMS nodes/camhistograms nodes/camnode nodes/flydra2ros nodes/flydra2rviz
nodes/flydra2stats nodes/joysuperpacket nodes/liveplot nodes/main_brain nodes/showpose nodes/speakpose
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
1 change: 0 additions & 1 deletion Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions manifest.xml

This file was deleted.

25 changes: 25 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<package>
<name>ros_flydra</name>
<version>0.0.1</version>
<description>
ros_flydra
</description>
<author>Andrew Straw</author>
<maintainer email="[email protected]">Andrew Straw</maintainer>
<license>BSD</license>
<url>http://flydra.astraw.com</url>

<buildtool_depend>catkin</buildtool_depend>

<build_depend>message_generation</build_depend>
<build_depend>geometry_msgs</build_depend>
<build_depend>sensor_msgs</build_depend>

<run_depend>message_runtime</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>rospy</run_depend>
<run_depend>python-opencv</run_depend>
<run_depend>python-blist</run_depend>

</package>
11 changes: 11 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup(
packages=['ros_flydra'],
package_dir={'': 'src'})

setup(**setup_args)
10 changes: 0 additions & 10 deletions src/setup.py

This file was deleted.

4 changes: 0 additions & 4 deletions stack.xml

This file was deleted.

0 comments on commit 5dbcfe5

Please sign in to comment.