diff --git a/1.10.1-1.tar.gz b/1.10.1-1.tar.gz index 0db329c..dca4c9b 100644 Binary files a/1.10.1-1.tar.gz and b/1.10.1-1.tar.gz differ diff --git a/README.en.md b/README.en.md index e31f342..7896cb6 100644 --- a/README.en.md +++ b/README.en.md @@ -12,20 +12,139 @@ Software architecture description nodelet_core +input: +``` +nodelet_core/ +├── nodelet +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   ├── include +│   ├── mainpage.dox +│   ├── package.xml +│   ├── scripts +│   ├── src +│   └── srv +├── nodelet_core +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   └── package.xml +└── nodelet_topic_tools + ├── cfg + ├── CHANGELOG.rst + ├── CMakeLists.txt + ├── include + ├── mainpage.dox + └── package.xml + +``` + #### Installation -1. Dowload RPM +1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm +aarch64: -2. Install RPM +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm -sudo rpm -ivh nodelet_core-1.9.16-0.oe1.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-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm + +2. Install RPM + +aarch64: + +sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm --nodeps -force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm --nodeps -force #### Instructions -Exit the nodelet_core file under the /opt/ros/noetic/devel_isolated/ 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 + +``` +nodelet +├── cmake.lock +├── env.sh +├── include +│   └── nodelet +│   ├── NodeletList.h +│   ├── NodeletListRequest.h +│   ├── NodeletListResponse.h +│   ├── NodeletLoad.h +│   ├── NodeletLoadRequest.h +│   ├── NodeletLoadResponse.h +│   ├── NodeletUnload.h +│   ├── NodeletUnloadRequest.h +│   └── NodeletUnloadResponse.h +├── lib +│   ├── libnodeletlib.so +│   ├── nodelet +│   │   ├── cmake.lock +│   │   ├── declared_nodelets +│   │   ├── list_nodelets +│   │   └── nodelet +│   ├── pkgconfig +│   │   └── nodelet.pc +│   └── python2.7 +│   └── dist-packages +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + ├── common-lisp + │   └── ros + ├── gennodejs + │   └── ros + ├── nodelet + │   └── cmake + └── roseus + └── ros +nodelet_core +├── cmake.lock +├── env.sh +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +└── setup.zsh +nodelet_topic_tools +├── cmake.lock +├── env.sh +├── include +│   └── nodelet_topic_tools +│   └── NodeletThrottleConfig.h +├── lib +│   ├── pkgconfig +│   │   └── nodelet_topic_tools.pc +│   └── python2.7 +│   └── dist-packages +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── nodelet_topic_tools + ├── cmake + └── docs + +``` #### Contribution diff --git a/README.md b/README.md index 304114d..10430fd 100644 --- a/README.md +++ b/README.md @@ -9,22 +9,139 @@ nodelet包现在是nodelet_core的一部分。在以前的版本中，它们是 #### 软件架构 软件架构说明 -nodelet_core +文件内容: +``` +nodelet_core/ +├── nodelet +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   ├── include +│   ├── mainpage.dox +│   ├── package.xml +│   ├── scripts +│   ├── src +│   └── srv +├── nodelet_core +│   ├── CHANGELOG.rst +│   ├── CMakeLists.txt +│   └── package.xml +└── nodelet_topic_tools + ├── cfg + ├── CHANGELOG.rst + ├── CMakeLists.txt + ├── include + ├── mainpage.dox + └── package.xml +``` #### 安装教程 1.下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm +aarch64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.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-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm 2.安装rpm包 -sudo rpm -ivh nodelet_core-1.9.16-0.oe1.aarch64.rpm +aarch64: + +sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm --nodeps -force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm --nodeps -force #### 使用说明 -安装完成以后，在/opt/ros/noetic/devel_isolated/目录下有nodelet_core/文件夹证明安装成功 +依赖环境安装: + +sh /opt/ros/noetic/install_dependence.sh + +安装完成以后，在/opt/ros/noetic/目录下有如下输出,则表示安装成功 + +输出: +``` +nodelet +├── cmake.lock +├── env.sh +├── include +│   └── nodelet +│   ├── NodeletList.h +│   ├── NodeletListRequest.h +│   ├── NodeletListResponse.h +│   ├── NodeletLoad.h +│   ├── NodeletLoadRequest.h +│   ├── NodeletLoadResponse.h +│   ├── NodeletUnload.h +│   ├── NodeletUnloadRequest.h +│   └── NodeletUnloadResponse.h +├── lib +│   ├── libnodeletlib.so +│   ├── nodelet +│   │   ├── cmake.lock +│   │   ├── declared_nodelets +│   │   ├── list_nodelets +│   │   └── nodelet +│   ├── pkgconfig +│   │   └── nodelet.pc +│   └── python2.7 +│   └── dist-packages +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + ├── common-lisp + │   └── ros + ├── gennodejs + │   └── ros + ├── nodelet + │   └── cmake + └── roseus + └── ros +nodelet_core +├── cmake.lock +├── env.sh +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +└── setup.zsh +nodelet_topic_tools +├── cmake.lock +├── env.sh +├── include +│   └── nodelet_topic_tools +│   └── NodeletThrottleConfig.h +├── lib +│   ├── pkgconfig +│   │   └── nodelet_topic_tools.pc +│   └── python2.7 +│   └── dist-packages +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── nodelet_topic_tools + ├── cmake + └── docs +``` + #### 参与贡献 diff --git a/nodelet_core.spec b/nodelet_core.spec index eae3b22..24ee851 100644 --- a/nodelet_core.spec +++ b/nodelet_core.spec @@ -1,7 +1,7 @@ -Name: nodelet_core +Name: ros-noetic-ros-nodelet_core Version: 1.10.1 Release: 1 -Summary: This is ROS noetic nodelet_core 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 and MPL-2.0 and GPL-3.0-only and GPL-2.0-or-later and MPL-1.1 and IJG and Zlib and OFL-1.1 URL: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core Source0: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core/1.10.1-1.tar.gz @@ -32,7 +32,7 @@ BuildRequires: gtest-devel BuildRequires: gmock-devel %description -This is ROS noetic nodelet_core Package. +This is %{name} Package %prep %setup @@ -87,6 +87,7 @@ cd .. #compile ./src/catkin/bin/catkin_make_isolated --install +cp install_dependence.sh install_isolated/ #### # 对install_isoloate内部的变量名称进行替换