Skip to content

Commit

Permalink
place .xml file in share directory
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikN committed Dec 5, 2023
1 parent 3db1d44 commit fa12c36
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions rosbot_bringup/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
("share/" + package_name, ["package.xml"]),
(os.path.join("share", package_name, "launch"), glob("launch/*.launch.py")),
(os.path.join("share", package_name, "config"), glob("config/*.yaml")),
(os.path.join("share", package_name, "config"), glob("config/*.xml")),
],
install_requires=["setuptools"],
zip_safe=True,
Expand Down
13 changes: 7 additions & 6 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,22 @@ RUN apt-get update && apt-get install -y \
rosdep update --rosdistro $ROS_DISTRO && \
rosdep install --from-paths src --ignore-src -y

# Create health check package
RUN cd src/ && \
MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
source /opt/$MYDISTRO/$ROS_DISTRO/setup.bash && \
# Create health check package
ros2 pkg create healthcheck_pkg --build-type ament_cmake --dependencies rclcpp nav_msgs && \
sed -i '/find_package(nav_msgs REQUIRED)/a \
add_executable(healthcheck_node src/healthcheck.cpp)\n \
ament_target_dependencies(healthcheck_node rclcpp nav_msgs)\n \
install(TARGETS healthcheck_node DESTINATION lib/${PROJECT_NAME})' \
/ros2_ws/src/healthcheck_pkg/CMakeLists.txt && \
mv /healthcheck.cpp /ros2_ws/src/healthcheck_pkg/src/ && \
cd .. && \
# Build
colcon build \
mv /healthcheck.cpp /ros2_ws/src/healthcheck_pkg/src/

# Build
RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
source /opt/$MYDISTRO/$ROS_DISTRO/setup.bash && \
colcon build \
--cmake-args -DCMAKE_BUILD_TYPE=Release \
--packages-skip \
ackermann_steering_controller \
Expand Down
2 changes: 2 additions & 0 deletions tools/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ services:
dockerfile: tools/Dockerfile
devices:
- ${SERIAL_PORT-:/dev/null}
environment:
- ROS_LOCALHOST_ONLY=1
command: >
ros2 launch rosbot_bringup combined.launch.py
mecanum:=${MECANUM:-False}
Expand Down

0 comments on commit fa12c36

Please sign in to comment.