diff --git a/1.14.6-1.tar.gz b/1.15.11-1.tar.gz similarity index 67% rename from 1.14.6-1.tar.gz rename to 1.15.11-1.tar.gz index 555774d..7874c22 100644 Binary files a/1.14.6-1.tar.gz and b/1.15.11-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 97030e1..4ceca1f 100644 --- a/README.en.md +++ b/README.en.md @@ -1,22 +1,26 @@ # ros_comm #### Description -ros_comm package that belongs to THE ROS-COMM + +ROS communications-related packages, including core client libraries (roscpp, rospy) and graph introspection tools (rostopic, rosnode, rosservice, rosparam). #### 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. #### Installation -1. xxxx -2. xxxx -3. xxxx +1. Dowload 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 + +sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm #### Instructions -1. xxxx -2. xxxx -3. xxxx +Exit the ros_comm file under the /opt/ros/melodic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 705ad72..fe2638e 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,26 @@ # ros_comm #### 介绍 -ros_comm package that belongs to THE ROS-COMM +ros_comm软件包提供了与ROS通信相关的软件包，包括核心客户端库（roscpp，rospy）和图形工具 #### 软件架构 软件架构说明 +该ros_comm堆栈包含ROS中间件/通信包。这些程序包统称为ROS“图形”层。它们为主题，节点，服务和参数提供了实现和工具。这包括受支持的ROS客户端库：roscpp，rospy和roslisp。 #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. 下载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包 + +sudo rpm -ivh ros_comm-1.15.11-1.oe1.aarch64.rpm #### 使用说明 -1. xxxx -2. xxxx -3. xxxx +安装完成以后，在/opt/ros/melodic/目录下有ros_comm/文件夹证明安装成功 #### 参与贡献 diff --git a/ros_comm.spec b/ros_comm.spec index e923b3e..973f210 100644 --- a/ros_comm.spec +++ b/ros_comm.spec @@ -1,143 +1,103 @@ Name: ros_comm -Version: 1.14.6 +Version: 1.15.11 Release: 1 -Summary: This is ROS melodic ros_comm Package -License: GPL -URL: https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm -Source0: https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm/1.14.6-1.tar.gz +Summary: This is ROS noetic ros_comm 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 BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: lz4-devel BuildRequires: bzip2-devel -BuildRequires: python-devel -BuildRequires: python-setuptools -#Requires: python-empy +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: openssl-devel -#BuildRequires: gcc-gfortran -#BuildRequires: openblas-devel -#BuildRequires: sqlite-devel -#BuildRequires: fftw-devel BuildRequires: boost-devel -#BuildRequires: python3-devel -#BuildRequires: boost-python3-devel +BuildRequires: python3-gpgme +BuildRequires: gpgme-devel +BuildRequires: cpp-gpgme +BuildRequires: python3-crypto +BuildRequires: gtest-devel +BuildRequires: gmock-devel %description -This is ROS melodic ros_comm Package. +This is ROS noetic ros_comm Package. %prep -%setup -#cd catkin-0.7.26/ - - - - -#%build - -#pwd -#mkdir build/ -#cd build/ && cmake .. - - +%setup %install -pwd - -#mkdir -p build/ -#cd build/ -#cmake .. -#cd .. - -cd src/ cd 3rdparty/ cd empy-3.3.4/ -python setup.py install --user +python3 setup.py install --user cd .. cd six-1.15.0/ -python setup.py install --user +python3 setup.py install --user cd .. cd setuptools_scm-4.1.2/ -python setup.py install --user +python3 setup.py install --user cd .. cd python-dateutil-2.8.1/ -python setup.py install --user +python3 setup.py install --user cd .. cd pyparsing-2.4.7/ -python setup.py install --user +python3 setup.py install --user cd .. cd docutils-0.16/ -python setup.py install --user +python3 setup.py install --user cd .. cd catkin_pkg-0.4.22/ -python setup.py install --user +python3 setup.py install --user cd .. -#for std_msgs cd PyYAML-5.3.1/ -python setup.py install --user +python3 setup.py install --user +cd .. + +cd distro-1.5.0/ +python3 setup.py install --user +cd .. + +cd rospkg-1.2.8/ +python3 setup.py install --user +cd .. + cd .. -cd console_bridge/ -mkdir build/ -cd build/ -cmake .. -make -make install -cd .. -cd .. - -cd poco/ -mkdir cmake-build/ -mkdir cmake-release/ -cd cmake-build/ -cmake .. -make -j8 -make install -cd .. -cd .. - - -cd tinyxml2/ -mkdir build -cd build -cmake .. -make -j5 -make install -cd .. -cd .. - - - -cd .. -cd .. - - - -#compile -./src/catkin/bin/catkin_make_isolated - - -#install -mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/ - -echo %{buildroot} +./src/catkin/bin/catkin_make_isolated --install +#### +# 对install_isoloate内部的变量名称进行替换 +# +#### +SRC_PATH=$PWD/install_isolated +DST_PATH=/opt/ros/noetic +sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` +#### +# 添加.catkin和.rosinstall文件 +# +#### +mkdir -p %{buildroot}/opt/ros/noetic/ +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/melodic/* -/opt/ros/melodic/* -#/usr/lib/share/catkin/cmake/* - +%defattr(-,root,root) +/opt/ros/noetic/* +/opt/ros/noetic/.rosinstall +/opt/ros/noetic/.catkin +#/usr/local/* %changelog -* Thu May 28 2020 openEuler Buildteam - 19.4-1 +* Thu 12-15-2020 openEuler Buildteam - Package init - diff --git a/ros_comm.yaml b/ros_comm.yaml new file mode 100644 index 0000000..099eea5 --- /dev/null +++ b/ros_comm.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/ros_comm.git +tag_prefix: 1.15.11-1 +separator: "."