From 1c9274ffeeb0253f0894b8d89f4fae5121ac165e Mon Sep 17 00:00:00 2001 From: Michael Grupp Date: Thu, 22 Oct 2020 17:33:45 +0200 Subject: [PATCH] Default to master in rosinstall (fixes #1122). (#1530) This makes much more sense than 1.0.0, which is counter-intuitive. If someone is building from source they usually do it to build the latest bleeding-edge version. Signed-off-by: Michael Grupp --- cartographer_ros.rosinstall | 4 ++-- docs/source/compilation.rst | 3 ++- scripts/prepare_catkin_workspace.sh | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cartographer_ros.rosinstall b/cartographer_ros.rosinstall index 6927cb8..c0b4b4f 100644 --- a/cartographer_ros.rosinstall +++ b/cartographer_ros.rosinstall @@ -1,3 +1,3 @@ -- git: {local-name: cartographer, uri: 'https://github.com/cartographer-project/cartographer.git', version: '1.0.0'} -- git: {local-name: cartographer_ros, uri: 'https://github.com/cartographer-project/cartographer_ros.git', version: '1.0.0'} +- git: {local-name: cartographer, uri: 'https://github.com/cartographer-project/cartographer.git', version: 'master'} +- git: {local-name: cartographer_ros, uri: 'https://github.com/cartographer-project/cartographer_ros.git', version: 'master'} - git: {local-name: ceres-solver, uri: 'https://ceres-solver.googlesource.com/ceres-solver.git', version: '1.13.0'} diff --git a/docs/source/compilation.rst b/docs/source/compilation.rst index 0d922a9..279ece8 100644 --- a/docs/source/compilation.rst +++ b/docs/source/compilation.rst @@ -71,7 +71,8 @@ The command 'sudo rosdep init' will print an error if you have already executed rosdep update rosdep install --from-paths src --ignore-src --rosdistro=${ROS_DISTRO} -y -If you build cartographer from master. Change/remove the version in the cartographer_ros.rosinstall. +This builds Cartographer from the latest HEAD of the master branch. +If you want a specific version, you need to change the version in the cartographer_ros.rosinstall. Additionally, uninstall the ros abseil-cpp using diff --git a/scripts/prepare_catkin_workspace.sh b/scripts/prepare_catkin_workspace.sh index 7e38d24..77b870e 100755 --- a/scripts/prepare_catkin_workspace.sh +++ b/scripts/prepare_catkin_workspace.sh @@ -26,6 +26,10 @@ wstool init # Merge the cartographer_ros.rosinstall file and fetch code for dependencies. wstool merge ../../cartographer_ros/cartographer_ros.rosinstall -wstool set cartographer -v ${CARTOGRAPHER_VERSION} -y +# We default to master and wstool seems to have a bug when it's being set twice. +# TODO(MichaelGrupp): wstool is unmaintained, use vcstool. +if [ ${CARTOGRAPHER_VERSION} != "master" ]; then + wstool set cartographer -v ${CARTOGRAPHER_VERSION} -y +fi wstool remove cartographer_ros wstool update