From 88077f2cdb1d5eb8fd992893ae3c15846c60cc4f Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Wed, 8 Apr 2020 14:35:30 +0900 Subject: [PATCH 1/5] Add travis test with libpcl-dev and libopenni2-dev on kinetic To catch https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 810fb1ec7..a4c511987 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ env: - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-pr2eus" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST=false # For updating euslisp-docs (Must be USE_TRAVIS=true and IS_EUSLISP_TRAVIS_TEST=false. See after_success) - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false NOT_TEST_INSTALL=true + - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="libopenni2-dev libpcl-dev" NOT_TEST_INSTALL=true # To catch https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446 - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true - USE_JENKINS=true ROS_DISTRO=melodic USE_DEB=true From f248138d5d3957559cfdc613575306c01fd63a02 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Wed, 8 Apr 2020 14:11:43 +0900 Subject: [PATCH 2/5] Use latest hrpsys when hrpsys is built on kinetic, in case libpcl-dev and libopenni2-dev exist We want to use source of released hrpsys, but building it fails on kinetic when libpcl-dev and libopenni2-dev exist. Waiting for https://github.com/fkanehiro/hrpsys-base/pull/1242 to be released. Details: https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446 --- .travis.rosinstall.kinetic | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic index c3aad3da4..9b4cf2b24 100644 --- a/.travis.rosinstall.kinetic +++ b/.travis.rosinstall.kinetic @@ -2,7 +2,14 @@ uri: https://github.com/tork-a/openhrp3-release version: release/kinetic/openhrp3 local-name: openhrp3 +# We want to use source of released hrpsys, but building it fails when libpcl-dev and libopenni2-dev exist. +# Waiting for https://github.com/fkanehiro/hrpsys-base/pull/1242 to be released. +# Details: https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446 +# - git: +# uri: https://github.com/tork-a/hrpsys-release +# version: release/kinetic/hrpsys +# local-name: hrpsys - git: - uri: https://github.com/tork-a/hrpsys-release - version: release/kinetic/hrpsys + uri: https://github.com/fkanehiro/hrpsys-base + version: master local-name: hrpsys From 826344d8a0362ed27049e1528d12a0928bfa7057 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Wed, 8 Apr 2020 15:08:44 +0900 Subject: [PATCH 3/5] Fix typos and format README --- README.md | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 3325becbf..7f9131e58 100644 --- a/README.md +++ b/README.md @@ -4,38 +4,40 @@ A package suite that provides all the capabilities for the ROS users to connect ## Install -This document explains how to use and how to contribute to rtm-ros-robotics softwares ([openrtm_aist_core](https://github.com/start-jsk/openrtm_aist_core), [openhrp3](https://github.com/start-jsk/openhrp3), [hrpsys](https://github.com/start-jsk/hrpsys), [rtshell_core](https://github.com/start-jsk/rtshell_core), [rtmros_common](https://github.com/start-jsk/rtmros_common), [rtmros_hironx](https://github.com/start-jsk/rtmros_hironx), [rtmros_tutorial](https://github.com/start-jsk/rtmros_turorial), [rtmros_gazebo](https://github.com/start-jsk/rtmros_gazebo)). The instruction uses `rtmros_common` repository as an example, but also works for other rtm-ros-robotics repositories. +This document explains how to use and how to contribute to rtm-ros-robotics software ([openrtm_aist_core](https://github.com/start-jsk/openrtm_aist_core), [openhrp3](https://github.com/start-jsk/openhrp3), [hrpsys](https://github.com/start-jsk/hrpsys), [rtshell_core](https://github.com/start-jsk/rtshell_core), [rtmros_common](https://github.com/start-jsk/rtmros_common), [rtmros_hironx](https://github.com/start-jsk/rtmros_hironx), [rtmros_tutorial](https://github.com/start-jsk/rtmros_turorial), [rtmros_gazebo](https://github.com/start-jsk/rtmros_gazebo)). The instruction uses `rtmros_common` repository as an example, but also works for other rtm-ros-robotics repositories. 1. Install software - rtm-ros-robotics software is distributed as ros-debian packages, if you already uses ROS system, install the software as follows: + rtm-ros-robotics software is distributed as ros-debian packages, if you already use ROS system, install the software as follows: - `sudo apt-get install ros-${ROS_DISTRO}-rtmros-common` **NOTE** Currently, those packages are not released to `melodic` distribution. Please compile all rtm-ros-robotics source code by following the section below ("2. Compile from source code"). - If you did not installed ROS sysem, please follow [this instruction](http://wiki.ros.org/ROS/Installation). + If you did not install ROS system, please follow [this instruction](http://wiki.ros.org/ROS/Installation). - ``sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -a` main" > /etc/apt/sources.list.d/ros-latest.list'`` - `wget http://packages.ros.org/ros.key -O - | sudo apt-key add -` - `sudo apt-get update` - `sudo apt-get update ros-${ROS_DISTRO}-base` - `sudo rosdep init` - `rosdep update` - - `source /opt/ros/${ROS_DISTRO}/setup.bash` # it is better to source ROS environment everytime terminal starts (`echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc`) + - `source /opt/ros/${ROS_DISTRO}/setup.bash` # it is better to source ROS environment every time terminal starts (`echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc`) 2. Compile from source code You may have two choices, one is to compile target repository (rtmros_common) only, the other is to compile all rtm-ros-robotics source code. - First, create catkin workspace and add rtmros_common + First, create catkin workspace and add rtmros_common: - `mkdir -p ~/catkin_ws/src` - `cd ~/catkin_ws/src` - `wstool init .` - `wstool set rtmros_common https://github.com/start-jsk/rtmros_common --git -y` - If compile all source code + If you want to compile all source code: + - (If the target repository is not `rtmros_common`) `wstool set rtmros_common https://github.com/start-jsk/rtmros_common --git -y` - `wstool merge https://raw.githubusercontent.com/start-jsk/rtmros_common/master/.travis.rosinstall -y` - `wstool merge https://raw.githubusercontent.com/start-jsk/rtmros_common/master/.travis.rosinstall.${ROS_DISTRO} -y` + - Please ignore `Unable to download URL` error on `indigo` distribution - Both methods needs following procedures. + Both methods need following procedures: - `wstool update` - `cd ..` - `source /opt/ros/${ROS_DISTRO}/setup.bash` @@ -43,34 +45,34 @@ This document explains how to use and how to contribute to rtm-ros-robotics soft - `sudo apt-get install python-catkin-tools` - `catkin build` -3. Contributes to rtm-ros-robotics projects. +3. Contribute to rtm-ros-robotics projects. - First fork the target repository on GitHub - - Move to the package direcotry - - `source ~/catkin_ws/devel/setup.bash` - - `roscd rtmros_common` - - create branch for your fix - - `git checkout -b your_awesome_code_branch` - - write awesome code and commit to local repo - - ... wite code.... - - `git commit -m "detailed description of what you did"` - - Add your forked repository as upstream - - `git remote add experimental https://github.com//rtmros_common` + - Move to the package directory + - `source ~/catkin_ws/devel/setup.bash` + - `roscd rtmros_common` + - Create branch for your fix + - `git checkout -b your_awesome_code_branch` + - Write awesome code and commit to local repo + - ...Write code.... + - `git commit -m "detailed description of what you did"` + - Add your forked repository as upstream + - `git remote add experimental https://github.com//rtmros_common` - `git push experimental your_awesome_code_branch` - Submit a pull request on GitHub to the repository - - Please check travic-ci status after sending your pull request. + - Please check travis-ci status after sending your pull request. -4. Uses other forked repository *before* merged into master. +4. Use other forked repository *before* merged into master. You don't need to wait for the maintainers to merge some pull requests by others before you use them. - Adding other's remote repository to your git remote - - `git remote add https://github.com//rtmros_common` + - `git remote add https://github.com//rtmros_common` - Fetch branches from the remote. - - `git fetch ` + - `git fetch ` - Merge those remote branch into your current branch - - `git merge /` + - `git merge /` ## For maintainers From 028148607451c9b374db4e61c9cd1e4f2e698526 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Thu, 9 Apr 2020 23:27:14 +0900 Subject: [PATCH 4/5] Add libopencv-dev installation on kinetic to compile hrpsys-simulator in hrpsys-base Details: - https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804 - https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611476618 --- .travis.rosinstall.kinetic | 2 ++ .travis.yml | 5 +++++ README.md | 2 ++ 3 files changed, 9 insertions(+) diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic index 9b4cf2b24..4d4444529 100644 --- a/.travis.rosinstall.kinetic +++ b/.travis.rosinstall.kinetic @@ -5,6 +5,8 @@ # We want to use source of released hrpsys, but building it fails when libpcl-dev and libopenni2-dev exist. # Waiting for https://github.com/fkanehiro/hrpsys-base/pull/1242 to be released. # Details: https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446 +# Don't forget to remove libopencv-dev installation from .travis.yml and README when using hrpsys-release again. +# Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804 # - git: # uri: https://github.com/tork-a/hrpsys-release # version: release/kinetic/hrpsys diff --git a/.travis.yml b/.travis.yml index a4c511987..dd6264e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,11 @@ notifications: on_failure: always #[always|never|change] # default: always before_script: - set -x + # Install libopencv-dev manually to compile hrpsys-simulator in hrpsys-base on kinetic + # Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804 + # https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611476618 + # Waiting for .travis.rosinstall.kinetic to use hrpsys-release + - if [ "${ROS_DISTRO}" == "kinetic" ] && [ "${USE_DEB}" != "true" ] ; then if [ "${EXTRA_DEB}" == "" ] ; then export EXTRA_DEB="libopencv-dev"; else export EXTRA_DEB="${EXTRA_DEB} libopencv-dev"; fi; fi # Forcely upgrade PCRE to avoid failure in building hrpsys with hydro. # This has a side effect, and we need extra settings. # Issue detail: https://github.com/start-jsk/rtmros_common/issues/1076 diff --git a/README.md b/README.md index 7f9131e58..993b8aecd 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ This document explains how to use and how to contribute to rtm-ros-robotics soft If you want to compile all source code: - (If the target repository is not `rtmros_common`) `wstool set rtmros_common https://github.com/start-jsk/rtmros_common --git -y` + - (On `kinetic` distribution) `sudo apt-get install libopencv-dev` + - Skipping this may cause [runtime error](https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804) - `wstool merge https://raw.githubusercontent.com/start-jsk/rtmros_common/master/.travis.rosinstall -y` - `wstool merge https://raw.githubusercontent.com/start-jsk/rtmros_common/master/.travis.rosinstall.${ROS_DISTRO} -y` - Please ignore `Unable to download URL` error on `indigo` distribution From 2a20c60f9be11b9a8c8343f2b28ea2ee4ffa4085 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 11 Apr 2020 00:43:08 +0900 Subject: [PATCH 5/5] Fix deprecated repository URL in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 993b8aecd..4ad683519 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A package suite that provides all the capabilities for the ROS users to connect ## Install -This document explains how to use and how to contribute to rtm-ros-robotics software ([openrtm_aist_core](https://github.com/start-jsk/openrtm_aist_core), [openhrp3](https://github.com/start-jsk/openhrp3), [hrpsys](https://github.com/start-jsk/hrpsys), [rtshell_core](https://github.com/start-jsk/rtshell_core), [rtmros_common](https://github.com/start-jsk/rtmros_common), [rtmros_hironx](https://github.com/start-jsk/rtmros_hironx), [rtmros_tutorial](https://github.com/start-jsk/rtmros_turorial), [rtmros_gazebo](https://github.com/start-jsk/rtmros_gazebo)). The instruction uses `rtmros_common` repository as an example, but also works for other rtm-ros-robotics repositories. +This document explains how to use and how to contribute to rtm-ros-robotics software ([openrtm_aist](https://github.com/tork-a/openrtm_aist-release), [openhrp3](https://github.com/fkanehiro/openhrp3), [hrpsys](https://github.com/fkanehiro/hrpsys-base), [rtshell](https://github.com/tork-a/rtshell-release), [rtctree](https://github.com/tork-a/rtctree-release), [rtsprofile](https://github.com/tork-a/rtsprofile-release), [rtmros_common](https://github.com/start-jsk/rtmros_common), [rtmros_hironx](https://github.com/start-jsk/rtmros_hironx), [rtmros_tutorials](https://github.com/start-jsk/rtmros_tutorials), [rtmros_gazebo](https://github.com/start-jsk/rtmros_gazebo)). The instruction uses `rtmros_common` repository as an example, but also works for other rtm-ros-robotics repositories. 1. Install software