Skip to content

Commit 2630fe1

Browse files
committed
added python setup files and wet'ed plot tools
1 parent 0a9d875 commit 2630fe1

File tree

12 files changed

+87
-45
lines changed

12 files changed

+87
-45
lines changed

bag_tools/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ catkin_package(
1010
CATKIN_DEPENDS rosbag
1111
)
1212

13+
catkin_python_setup()
14+
1315
include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
1416

1517
add_executable(extract_images src/extract_images.cpp)

bag_tools/setup.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env python
2+
3+
from distutils.core import setup
4+
from catkin_pkg.python_setup import generate_distutils_setup
5+
6+
d = generate_distutils_setup(
7+
## don't do this unless you want a globally visible script
8+
# scripts=['bin/myscript'],
9+
packages=['PYTHON_PACKAGE_NAME'],
10+
package_dir={'': 'scripts'}
11+
)
12+
13+
setup(**d)

launch_tools/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ project(launch_tools)
33

44
find_package(catkin REQUIRED COMPONENTS rospy roslib)
55

6-
catkin_package()
6+
catkin_package()
7+
8+
catkin_python_setup()

launch_tools/setup.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env python
2+
3+
from distutils.core import setup
4+
from catkin_pkg.python_setup import generate_distutils_setup
5+
6+
d = generate_distutils_setup(
7+
## don't do this unless you want a globally visible script
8+
# scripts=['bin/myscript'],
9+
packages=['PYTHON_PACKAGE_NAME'],
10+
package_dir={'': 'scripts'}
11+
)
12+
13+
setup(**d)

plot_tools/CMakeLists.txt

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,8 @@
1-
cmake_minimum_required(VERSION 2.4.6)
2-
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(plot_tools)
33

4-
# Set the build type. Options are:
5-
# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
6-
# Debug : w/ debug symbols, w/o optimization
7-
# Release : w/o debug symbols, w/ optimization
8-
# RelWithDebInfo : w/ debug symbols, w/ optimization
9-
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
10-
#set(ROS_BUILD_TYPE RelWithDebInfo)
4+
find_package(catkin REQUIRED COMPONENTS rospy)
115

12-
rosbuild_init()
6+
catkin_package()
137

14-
#set the default path for built executables to the "bin" directory
15-
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
16-
#set the default path for built libraries to the "lib" directory
17-
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
18-
19-
#uncomment if you have defined messages
20-
#rosbuild_genmsg()
21-
#uncomment if you have defined services
22-
#rosbuild_gensrv()
23-
24-
#common commands for building c++ executables and libraries
25-
#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
26-
#target_link_libraries(${PROJECT_NAME} another_library)
27-
#rosbuild_add_boost_directories()
28-
#rosbuild_link_boost(${PROJECT_NAME} thread)
29-
#rosbuild_add_executable(example examples/example.cpp)
30-
#target_link_libraries(example ${PROJECT_NAME})
8+
catkin_python_setup()

plot_tools/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

plot_tools/manifest.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

plot_tools/package.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<package>
2+
<name>plot_tools</name>
3+
<version>0.0.1</version>
4+
<description>plot_tools</description>
5+
<maintainer email="[email protected]">Pep Lluis Negre</maintainer>
6+
7+
<license>BSD</license>
8+
9+
<url type="website">http://ros.org/wiki/plot_tools</url>
10+
<!-- <url type="bugtracker"></url> -->
11+
12+
<author>Pep Lluis Negre</author>
13+
14+
<buildtool_depend>catkin</buildtool_depend>
15+
<build_depend>rospy</build_depend>
16+
<run_depend>rospy</run_depend>
17+
<!-- <test_depend>rospy</test_depend> -->
18+
19+
<export>
20+
21+
</export>
22+
</package>

plot_tools/setup.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env python
2+
3+
from distutils.core import setup
4+
from catkin_pkg.python_setup import generate_distutils_setup
5+
6+
d = generate_distutils_setup(
7+
## don't do this unless you want a globally visible script
8+
# scripts=['bin/myscript'],
9+
packages=['PYTHON_PACKAGE_NAME'],
10+
package_dir={'': 'scripts'}
11+
)
12+
13+
setup(**d)

srv_tools/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<run_depend>tf_tools</run_depend>
1818
<run_depend>pointcloud_tools</run_depend>
1919
<run_depend>bag_tools</run_depend>
20+
<run_depend>plot_tools</run_depend>
2021

2122
<export>
2223
<metapackage/>

0 commit comments

Comments
 (0)