From c26e7aa95ae82d962713780160d64ebda368baac Mon Sep 17 00:00:00 2001 From: alesolano Date: Wed, 17 Apr 2019 13:07:23 +0200 Subject: [PATCH 1/3] hack to replace remove melodic from setup.bash after compiling ros1 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6a0b875..dcc2c1e 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ cd ~/ros2_mara_ws && colcon build --merge-install --packages-skip individual_tra ```bash source /opt/ros/melodic/setup.bash cd ~/ros2_mara_ws && colcon build --merge-install --packages-select individual_trajectories_bridge +sed -i 's/melodic/crystal/g' ~/ros2_mara_ws/install/setup.bash ``` #### Set up MoveITt! (for now in ROS) From 4fa37a56c4e034ba59f3953f12084df6cd5fb06e Mon Sep 17 00:00:00 2001 From: alesolano Date: Wed, 17 Apr 2019 13:28:02 +0200 Subject: [PATCH 2/3] add comment to explain previous hack --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dcc2c1e..0e76ac4 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ cd ~/ros2_mara_ws && colcon build --merge-install --packages-skip individual_tra ```bash source /opt/ros/melodic/setup.bash cd ~/ros2_mara_ws && colcon build --merge-install --packages-select individual_trajectories_bridge +# Building ROS1 would create conflicts with this ROS2 workspace in the future. Next line ensures the workspace is completely ROS2. sed -i 's/melodic/crystal/g' ~/ros2_mara_ws/install/setup.bash ``` From 89d605edfcc735ef287cfddd7662499c83c1d829 Mon Sep 17 00:00:00 2001 From: alesolano Date: Wed, 17 Apr 2019 13:32:29 +0200 Subject: [PATCH 3/3] be more specific when replacing melodic --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e76ac4..27b50e9 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ cd ~/ros2_mara_ws && colcon build --merge-install --packages-skip individual_tra source /opt/ros/melodic/setup.bash cd ~/ros2_mara_ws && colcon build --merge-install --packages-select individual_trajectories_bridge # Building ROS1 would create conflicts with this ROS2 workspace in the future. Next line ensures the workspace is completely ROS2. -sed -i 's/melodic/crystal/g' ~/ros2_mara_ws/install/setup.bash +sed -i 's#/opt/ros/melodic#/opt/ros/crystal#g' ~/ros2_mara_ws/install/setup.bash ``` #### Set up MoveITt! (for now in ROS)