diff --git a/1.15.11-1.tar.gz b/1.15.11-1.tar.gz index 124182c9f3628a8a9b24051d84e604a27afd1b88..dd2162eb969982a3815823e14c4edc11132d9315 100644 Binary files a/1.15.11-1.tar.gz and b/1.15.11-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 4ceca1f571d5a5010859f13ebc45c1d47b4358b3..6a82cce0dec06e45f2973f20fbe1560be5ea5a98 100644 --- a/README.en.md +++ b/README.en.md @@ -6,21 +6,99 @@ ROS communications-related packages, including core client libraries (roscpp, ro #### Software Architecture +Software architecture description + The ros_comm stack contains the ROS middleware/communications packages. These packages are collectively known as the ROS "Graph" layer. They provide implementations and tools for topics, nodes, services, and parameters. This includes the supported ROS client libraries: roscpp, rospy, and roslisp. +input: +``` +ros_comm +├── clients +│   ├── roscpp +│   └── rospy +├── ros_comm +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   └── package.xml +├── test +│   ├── test_rosbag +│   ├── test_rosbag_storage +│   ├── test_roscpp +│   ├── test_rosgraph +│   ├── test_roslaunch +│   ├── test_roslib_comm +│   ├── test_rosmaster +│   ├── test_rosparam +│   ├── test_rospy +│   ├── test_rosservice +│   ├── test_rostest +│   └── test_rostopic +├── tools +│   ├── rosbag +│   ├── rosbag_storage +│   ├── rosgraph +│   ├── roslaunch +│   ├── rosmaster +│   ├── rosmsg +│   ├── rosnode +│   ├── rosout +│   ├── rosparam +│   ├── rosservice +│   ├── rostest +│   ├── rostopic +│   └── topic_tools +└── utilities + ├── message_filters + ├── roslz4 + ├── roswtf + └── xmlrpcpp + +``` + #### Installation -1. Dowload RPM +1. Download RPM + +aarch64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm + +x86_64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ros_comm-1.15.11-1.oe1.aarch64.rpm +2. Install RPM -2. Install RPM +aarch64: -sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm --nodeps --force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm --nodeps --force #### Instructions -Exit the ros_comm file under the /opt/ros/melodic/ directory , Prove that the software installation is successful +Dependence installation + +sh /opt/ros/noetic/install_dependence.sh + +Exit the following output file under the /opt/ros/noetic/ directory , Prove that the software installation is successful + +output: +``` +ros_comm/ +├── cmake.lock +├── env.sh +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +└── setup.zsh + +``` #### Contribution diff --git a/README.md b/README.md index fe2638e3be5cb5c7e71edabd65955fdcf9f6accf..302e571fc7fc06f21c70a962401c7ad66d6ff923 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,95 @@ ros_comm软件包提供了与ROS通信相关的软件包，包括核心客户端 该ros_comm堆栈包含ROS中间件/通信包。这些程序包统称为ROS“图形”层。它们为主题，节点，服务和参数提供了实现和工具。这包括受支持的ROS客户端库：roscpp，rospy和roslisp。 +文件内容: +``` +ros_comm +├── clients +│   ├── roscpp +│   └── rospy +├── ros_comm +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   └── package.xml +├── test +│   ├── test_rosbag +│   ├── test_rosbag_storage +│   ├── test_roscpp +│   ├── test_rosgraph +│   ├── test_roslaunch +│   ├── test_roslib_comm +│   ├── test_rosmaster +│   ├── test_rosparam +│   ├── test_rospy +│   ├── test_rosservice +│   ├── test_rostest +│   └── test_rostopic +├── tools +│   ├── rosbag +│   ├── rosbag_storage +│   ├── rosgraph +│   ├── roslaunch +│   ├── rosmaster +│   ├── rosmsg +│   ├── rosnode +│   ├── rosout +│   ├── rosparam +│   ├── rosservice +│   ├── rostest +│   ├── rostopic +│   └── topic_tools +└── utilities + ├── message_filters + ├── roslz4 + ├── roswtf + └── xmlrpcpp + +``` + #### 安装教程 -1. 下载rpm包 +1. 下载rpm包 + +aarch64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm + +x86_64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-comm/ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ros_comm-1.15.11-1.oe1.aarch64.rpm +2. 安装rpm包 -2. 安装rpm包 +aarch64: -sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.aarch64.rpm --nodeps --force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-comm-1.15.11-2.oe2203.x86_64.rpm --nodeps --force #### 使用说明 -安装完成以后，在/opt/ros/melodic/目录下有ros_comm/文件夹证明安装成功 +依赖环境安装: + +sh /opt/ros/noetic/install_dependence.sh + +安装完成以后，在/opt/ros/noetic/目录下有如下输出,则表示安装成功 + +输出: +``` +ros_comm/ +├── cmake.lock +├── env.sh +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +└── setup.zsh + +``` #### 参与贡献 diff --git a/ros_comm.spec b/ros_comm.spec index a4d57d66815c94f0e8b51eda284c81271e5a238f..1118f59d6c68a201a17b5a766fa80e2efbbde7e8 100644 --- a/ros_comm.spec +++ b/ros_comm.spec @@ -1,7 +1,7 @@ -Name: ros_comm +Name: ros-noetic-ros-comm Version: 1.15.11 Release: 2 -Summary: This is ROS noetic ros_comm Package +Summary: This is ROS noetic %{name} Package License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only URL: https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/ros_comm Source0: https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/ros_comm/1.15.11-1.tar.gz @@ -13,15 +13,30 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: openssl-devel BuildRequires: boost-devel +BuildRequires: uuid-devel +BuildRequires: libuuid-devel +BuildRequires: libtiff-devel +BuildRequires: libwebp-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: yaml-cpp-devel BuildRequires: python3-gpgme BuildRequires: gpgme-devel BuildRequires: cpp-gpgme BuildRequires: python3-crypto +BuildRequires: boost-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: libpng-devel +BuildRequires: fltk-devel +BuildRequires: bullet-devel +BuildRequires: qt5-devel +BuildRequires: python3-sip-devel +BuildRequires: python3-qt5 +BuildRequires: python3-sip BuildRequires: gtest-devel BuildRequires: gmock-devel %description -This is ROS noetic ros_comm Package. +This is %{name} Package %prep %setup @@ -71,8 +86,8 @@ cd .. cd .. - ./src/catkin/bin/catkin_make_isolated --install +cp install_dependence.sh install_isolated/ #### # 对install_isoloate内部的变量名称进行替换 @@ -91,13 +106,13 @@ mkdir -p %{buildroot}/usr/local/ cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ -#cp -r 3rdparty/install/* %{buildroot}/usr/local/ + %files %defattr(-,root,root) /opt/ros/noetic/* /opt/ros/noetic/.rosinstall /opt/ros/noetic/.catkin -#/usr/local/* + %changelog * Sat Feb 26 2022 openEuler Buildteam - 1.15.11-2 - Fix issue 2065