Skip to content

Commit 9928f7c

Browse files
mrpropellersmrpropellers
committed
Cleaning up catkin workspaces
1 parent bff98ef commit 9928f7c

8 files changed

Lines changed: 23 additions & 405 deletions

File tree

‎tutorials/pick_and_place/PickAndPlaceProject/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/[Mm]emoryCaptures/
1616

1717
# Asset meta data should only be ignored when the corresponding asset is also ignored
18-
!/[Aa]ssets/**/*.meta
18+
# !/[Aa]ssets/**/*.meta
1919

2020
# Uncomment this line if you wish to ignore the asset store tools plugin
2121
# /[Aa]ssets/AssetStoreTools*

‎tutorials/pick_and_place/ROS/src/niryo_moveit/CMakeLists.txt‎

Lines changed: 3 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
cmake_minimum_required(VERSION 3.0.2)
22
project(niryo_moveit)
33

4-
## Compile as C++11, supported in ROS Kinetic and newer
5-
# add_compile_options(-std=c++11)
6-
7-
## Find catkin macros and libraries
8-
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
9-
## is used, also find other catkin packages
104
find_package(catkin REQUIRED COMPONENTS
11-
roscpp
125
rospy
136
std_msgs
147
geometry_msgs
@@ -22,59 +15,10 @@ find_package(catkin REQUIRED COMPONENTS
2215
)
2316
roslaunch_add_file_check(launch)
2417

25-
## System dependencies are found with CMake's conventions
26-
# find_package(Boost REQUIRED COMPONENTS system)
27-
28-
## Uncomment this if the package has a setup.py. This macro ensures
29-
## modules and global scripts declared therein get installed
30-
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
31-
# catkin_python_setup()
32-
33-
################################################
34-
## Declare ROS messages, services and actions ##
35-
################################################
36-
37-
## To declare and build messages, services or actions from within this
38-
## package, follow these steps:
39-
## * Let MSG_DEP_SET be the set of packages whose message types you use in
40-
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
41-
## * In the file package.xml:
42-
## * add a build_depend tag for "message_generation"
43-
## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
44-
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
45-
## but can be declared for certainty nonetheless:
46-
## * add a exec_depend tag for "message_runtime"
47-
## * In this file (CMakeLists.txt):
48-
## * add "message_generation" and every package in MSG_DEP_SET to
49-
## find_package(catkin REQUIRED COMPONENTS ...)
50-
## * add "message_runtime" and every package in MSG_DEP_SET to
51-
## catkin_package(CATKIN_DEPENDS ...)
52-
## * uncomment the add_*_files sections below as needed
53-
## and list every .msg/.srv/.action file to be processed
54-
## * uncomment the generate_messages entry below
55-
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
56-
57-
## Generate messages in the 'msg' folder
58-
add_message_files(
59-
FILES
60-
NiryoMoveitJoints.msg
61-
NiryoTrajectory.msg
62-
)
63-
64-
## Generate services in the 'srv' folder
65-
add_service_files(
66-
FILES
67-
MoverService.srv
68-
)
18+
add_message_files(DIRECTORY msg)
6919

70-
## Generate actions in the 'action' folder
71-
# add_action_files(
72-
# FILES
73-
# Action1.action
74-
# Action2.action
75-
# )
20+
add_service_files(DIRECTORY srv)
7621

77-
## Generate added messages and services with any dependencies listed here
7822
generate_messages(
7923
DEPENDENCIES
8024
geometry_msgs
@@ -83,128 +27,15 @@ generate_messages(
8327
sensor_msgs
8428
)
8529

86-
################################################
87-
## Declare ROS dynamic reconfigure parameters ##
88-
################################################
89-
90-
## To declare and build dynamic reconfigure parameters within this
91-
## package, follow these steps:
92-
## * In the file package.xml:
93-
## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
94-
## * In this file (CMakeLists.txt):
95-
## * add "dynamic_reconfigure" to
96-
## find_package(catkin REQUIRED COMPONENTS ...)
97-
## * uncomment the "generate_dynamic_reconfigure_options" section below
98-
## and list every .cfg file to be processed
99-
100-
## Generate dynamic reconfigure parameters in the 'cfg' folder
101-
# generate_dynamic_reconfigure_options(
102-
# cfg/DynReconf1.cfg
103-
# cfg/DynReconf2.cfg
104-
# )
105-
106-
###################################
107-
## catkin specific configuration ##
108-
###################################
109-
## The catkin_package macro generates cmake config files for your package
110-
## Declare things to be passed to dependent projects
111-
## INCLUDE_DIRS: uncomment this if your package contains header files
112-
## LIBRARIES: libraries you create in this project that dependent projects also need
113-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
114-
## DEPENDS: system dependencies of this project that dependent projects also need
115-
catkin_package(
116-
# INCLUDE_DIRS include
117-
# LIBRARIES niryo_moveit
118-
# CATKIN_DEPENDS rospy std_msgs
119-
# DEPENDS system_lib
120-
)
121-
122-
###########
123-
## Build ##
124-
###########
125-
126-
## Specify additional locations of header files
127-
## Your package locations should be listed before other locations
128-
include_directories(
129-
# include
130-
${catkin_INCLUDE_DIRS}
131-
)
30+
catkin_package()
13231

133-
## Declare a C++ library
134-
# add_library(${PROJECT_NAME}
135-
# src/${PROJECT_NAME}/niryo_moveit.cpp
136-
# )
137-
138-
## Add cmake target dependencies of the library
139-
## as an example, code may need to be generated before libraries
140-
## either from message generation or dynamic reconfigure
141-
# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
142-
143-
## Declare a C++ executable
144-
## With catkin_make all packages are built within a single CMake context
145-
## The recommended prefix ensures that target names across packages don't collide
146-
# add_executable(${PROJECT_NAME}_node src/niryo_moveit_node.cpp)
147-
148-
## Rename C++ executable without prefix
149-
## The above recommended prefix causes long target names, the following renames the
150-
## target back to the shorter version for ease of user use
151-
## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
152-
# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")
153-
154-
## Add cmake target dependencies of the executable
155-
## same as for the library above
156-
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
157-
158-
## Specify libraries to link a library or executable target against
159-
# target_link_libraries(${PROJECT_NAME}_node
160-
# ${catkin_LIBRARIES}
161-
# )
162-
163-
#############
164-
## Install ##
165-
#############
166-
167-
# all install targets should use catkin DESTINATION variables
168-
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
169-
170-
## Mark executable scripts (Python etc.) for installation
171-
## in contrast to setup.py, you can choose the destination
17232
catkin_install_python(PROGRAMS
17333
scripts/mover.py
17434
scripts/server_endpoint.py
17535
scripts/trajectory_subscriber.py
17636
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
17737
)
17838

179-
## Mark executables for installation
180-
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
181-
# install(TARGETS ${PROJECT_NAME}_node
182-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
183-
# )
184-
185-
## Mark libraries for installation
186-
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
187-
# install(TARGETS ${PROJECT_NAME}
188-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
189-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
190-
# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
191-
# )
192-
193-
## Mark cpp header files for installation
194-
# install(DIRECTORY include/${PROJECT_NAME}/
195-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
196-
# FILES_MATCHING PATTERN "*.h"
197-
# PATTERN ".svn" EXCLUDE
198-
# )
199-
200-
## Mark other files for installation (e.g. launch and bag files, etc.)
201-
# install(FILES
202-
# # myfile1
203-
# # myfile2
204-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
205-
# )
206-
207-
# FROM panda MoveIt tutorial repo
20839
install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
20940
PATTERN "setup_assistant.launch" EXCLUDE)
21041
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

‎tutorials/pick_and_place/ROS/src/niryo_moveit/config/params.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ROS_IP: 127.0.0.1
1+
ROS_IP: 172.17.238.250

‎tutorials/pick_and_place/ROS/src/niryo_moveit/package.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
<description>The niryo_moveit package</description>
66

77

8-
<maintainer email="unity@todo.todo">unity</maintainer>
8+
<maintainer email="unity-robotics@unity3d.com">Unity Robotics</maintainer>
99

10-
<license>TODO</license>
10+
<license>Apache 2.0</license>
1111

1212
<build_depend>message_generation</build_depend>
1313

1414
<exec_depend>message_runtime</exec_depend>
1515

1616
<buildtool_depend>catkin</buildtool_depend>
17-
<build_depend>roscpp</build_depend>
1817
<build_depend>rospy</build_depend>
1918
<build_depend>std_msgs</build_depend>
2019
<build_depend>geometry_msgs</build_depend>
@@ -23,12 +22,10 @@
2322
<build_depend>sensor_msgs</build_depend>
2423
<build_depend>controller_manager</build_depend>
2524
<build_depend>roslaunch</build_depend>
26-
<build_export_depend>roscpp</build_export_depend>
2725
<build_export_depend>rospy</build_export_depend>
2826
<build_export_depend>std_msgs</build_export_depend>
2927
<build_export_depend>geometry_msgs</build_export_depend>
3028
<build_export_depend>tcp_endpoint</build_export_depend>
31-
<exec_depend>roscpp</exec_depend>
3229
<exec_depend>rospy</exec_depend>
3330
<exec_depend>std_msgs</exec_depend>
3431
<exec_depend>geometry_msgs</exec_depend>

‎tutorials/pick_and_place/ROS/src/ros_tcp_endpoint‎

0 commit comments

Comments
 (0)