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

use catkin_install_python() to install Python scripts #361

Merged
merged 1 commit into from
Feb 19, 2014
Merged

use catkin_install_python() to install Python scripts #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions clients/roscpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ install(FILES ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/co
# install legacy infrastructure needed by rosbuild
install(FILES rosbuild/roscpp.cmake
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild)
install(PROGRAMS
catkin_install_python(PROGRAMS
rosbuild/scripts/genmsg_cpp.py
rosbuild/scripts/gensrv_cpp.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild/scripts)
install(FILES
rosbuild/scripts/msg_gen.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild/scripts)
2 changes: 1 addition & 1 deletion clients/roscpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<author>Brian Gerkey</author>
<author>Troy Straszheim</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend version_gte="0.3.17">cpp_common</build_depend>
<build_depend>message_generation</build_depend>
Expand Down
5 changes: 2 additions & 3 deletions clients/rospy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ catkin_python_setup()
# install legacy infrastructure needed by rosbuild
install(FILES rosbuild/rospy.cmake
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild)
install(PROGRAMS
catkin_install_python(PROGRAMS
rosbuild/scripts/genmsg_py.py
rosbuild/scripts/gensrv_py.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild/scripts)
install(FILES rosbuild/scripts/genutil.py
rosbuild/scripts/genutil.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rosbuild/scripts)
2 changes: 1 addition & 1 deletion clients/rospy/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<url>http://ros.org/wiki/rospy</url>
<author>Ken Conley</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>genpy</run_depend>
<run_depend>python-numpy</run_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/rosbag/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ install(TARGETS record play
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(PROGRAMS
catkin_install_python(PROGRAMS
scripts/bag2png.py
scripts/bagsort.py
scripts/fastrebag.py
Expand Down
2 changes: 1 addition & 1 deletion tools/rosbag/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<author>Jeremy Leibs</author>
<author>James Bowman</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend>boost</build_depend>
<build_depend>cpp_common</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/rosgraph/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install(FILES conf/python_logging.conf
DESTINATION ${CATKIN_GLOBAL_ETC_DESTINATION}/ros)
install(FILES conf/python_logging.conf
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/conf)
install(PROGRAMS scripts/rosgraph
catkin_install_python(PROGRAMS scripts/rosgraph
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

if(CATKIN_ENABLE_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion tools/rosgraph/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<url>http://ros.org/wiki/rosgraph</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>python-netifaces</run_depend>
<run_depend>python-rospkg</run_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/roslaunch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install(DIRECTORY resources
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

# required for old rosbuild macro to be under PKGNAME/scripts
install(PROGRAMS scripts/roslaunch-check
catkin_install_python(PROGRAMS scripts/roslaunch-check
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts)

if(CATKIN_ENABLE_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion tools/roslaunch/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<url>http://ros.org/wiki/roslaunch</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>python-paramiko</run_depend>
<run_depend>python-yaml</run_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/rosservice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ catkin_package()

catkin_python_setup()

install(PROGRAMS scripts/rosservice
catkin_install_python(PROGRAMS scripts/rosservice
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
2 changes: 1 addition & 1 deletion tools/rosservice/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<url>http://ros.org/wiki/rosservice</url>
<author>Ken Conley</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>genpy</run_depend>
<run_depend>rosgraph</run_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/rostest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ catkin_package(DEPENDS Boost
)
catkin_python_setup()

install(PROGRAMS nodes/hztest
catkin_install_python(PROGRAMS nodes/hztest
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/nodes/hztest)
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
Expand Down
2 changes: 1 addition & 1 deletion tools/rostest/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<url>http://ros.org/wiki/rostest</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend>boost</build_depend>
<build_depend>rosunit</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion tools/rostopic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ catkin_package()

catkin_python_setup()

install(PROGRAMS scripts/rostopic
catkin_install_python(PROGRAMS scripts/rostopic
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

if(CATKIN_ENABLE_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion tools/rostopic/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<url>http://ros.org/wiki/rostopic</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend>rostest</build_depend>

Expand Down
2 changes: 1 addition & 1 deletion tools/topic_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h")

install(PROGRAMS
catkin_install_python(PROGRAMS
scripts/mux_add
scripts/mux_delete
scripts/mux_list
Expand Down
2 changes: 1 addition & 1 deletion tools/topic_tools/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<author>Morgan Quigley</author>
<author>Brian Gerkey</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend>cpp_common</build_depend>
<build_depend>message_generation</build_depend>
Expand Down