From f64f6f88e0ce80db51196421bb9eb4f0bcdbc33b Mon Sep 17 00:00:00 2001 From: VictorLee Date: Tue, 15 Mar 2022 15:02:26 +0800 Subject: [PATCH 1/2] build dynamic lib of rosidl_typesupport of (#473) microxrcedds_c (cherry picked from commit 3136ad07d98cc4b50badfc57620325b5dc2b55eb) # Conflicts: # config/host/generic/build.sh # config/host/generic/client_host_packages.repos --- config/host/generic/build.sh | 9 +++++++++ config/host/generic/client_host_packages.repos | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index 1751e391..88691d51 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -1,9 +1,18 @@ #!/bin/bash +<<<<<<< HEAD colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src $@ colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src $@ +======= +colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ +colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ +>>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) set +o nounset . install/local_setup.bash set -o nounset +<<<<<<< HEAD colcon build --metas src $@ +======= +colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ +>>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index 0226b572..ceff4cd3 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -29,7 +29,15 @@ repositories: uros/micro-ROS-demos: type: git url: https://github.com/micro-ROS/micro-ROS-demos.git +<<<<<<< HEAD version: foxy +======= + version: galactic + uros/micro_ros_utilities: + type: git + url: https://github.com/micro-ROS/micro_ros_utilities + version: galactic +>>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) # Required messages packages From 63154c53866b8eecc9980a4ea1009f823e54b743 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Tue, 15 Mar 2022 08:04:34 +0100 Subject: [PATCH 2/2] Conflicts Signed-off-by: Pablo Garrido --- config/host/generic/build.sh | 15 +++------------ config/host/generic/client_host_packages.repos | 10 +--------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index 88691d51..c0d305fd 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -1,18 +1,9 @@ #!/bin/bash -<<<<<<< HEAD -colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src $@ -colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src $@ -======= -colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ -colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ ->>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) +colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src $@ --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src $@ --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON set +o nounset . install/local_setup.bash set -o nounset -<<<<<<< HEAD -colcon build --metas src $@ -======= -colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ ->>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) +colcon build --metas src $@ --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index ceff4cd3..e31ef489 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -9,7 +9,7 @@ repositories: version: foxy # MicroROS - + uros/rclc: type: git url: https://github.com/ros2/rclc.git @@ -29,15 +29,7 @@ repositories: uros/micro-ROS-demos: type: git url: https://github.com/micro-ROS/micro-ROS-demos.git -<<<<<<< HEAD version: foxy -======= - version: galactic - uros/micro_ros_utilities: - type: git - url: https://github.com/micro-ROS/micro_ros_utilities - version: galactic ->>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) # Required messages packages