diff --git a/1.13.0-1.tar.gz b/1.13.0-1.tar.gz index e419b6b2e10256af63f4470e8ee814a4e0dc570f..bf78c851a9cea03a7f3b4d9893bf0c6dc3403e1a 100644 Binary files a/1.13.0-1.tar.gz and b/1.13.0-1.tar.gz differ diff --git a/README.en.md b/README.en.md index fc9de6a6c25c77bbefd939914fffbffdfd217852..4e656286cb6bba993249a46b66e22e2840f7e83f 100644 --- a/README.en.md +++ b/README.en.md @@ -8,19 +8,78 @@ The pluginlib package provides tools for writing and dynamically loading plugins Pluginlib includes The Plugin Description File and Registering/Exporting a Plugin Class +input: +``` +pluginlib/ +├── CHANGELOG.rst +├── CMakeLists.txt +├── include +│   └── pluginlib +├── package.xml +├── scripts +│   └── pluginlib_headers_migration.py +└── test + ├── test_base.h + ├── test_plugins_broken.xml + ├── test_plugins.cpp + ├── test_plugins.h + ├── test_plugins.xml + ├── unique_ptr_test.cpp + └── utest.cpp + +``` + #### 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-pluginlib/ros-noetic-ros-pluginlib-1.13.0-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-pluginlib/ros-noetic-ros-pluginlib-1.13.0-1.oe2203.x86_64.rpm + +2. Install RPM + +aarch64: -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/pluginlib-1.13.0-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-pluginlib-1.13.0-1.oe2203.aarch64.rpm --nodeps --force -2. Install RPM +x86_64: -sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-pluginlib-1.13.0-1.oe2203.x86_64.rpm --nodeps --force #### Instructions -Exit the pluginlib file under the /opt/ros/noetic/ 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: +``` +pluginlib/ +├── cmake.lock +├── env.sh +├── lib +│   ├── pkgconfig +│   │   └── pluginlib.pc +│   └── pluginlib +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── pluginlib + └── cmake + +``` #### Contribution diff --git a/README.md b/README.md index ce6521930cd5e30bf66b8e1f2dcf648edee5a57e..81a1bb8a355b50a21cd647f6cc4ef835e00a032a 100644 --- a/README.md +++ b/README.md @@ -9,19 +9,76 @@ pluginlib是一个C ++库，用于从ROS包中加载和卸载插件。插件是 Pluginlib 包含注册/导出插件的类和插件描述xml文件 +文件内容: +``` +pluginlib/ +├── CHANGELOG.rst +├── CMakeLists.txt +├── include +│   └── pluginlib +├── package.xml +├── scripts +│   └── pluginlib_headers_migration.py +└── test + ├── test_base.h + ├── test_plugins_broken.xml + ├── test_plugins.cpp + ├── test_plugins.h + ├── test_plugins.xml + ├── unique_ptr_test.cpp + └── utest.cpp +``` + #### 安装教程 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/pluginlib-1.13.0-1.oe1.aarch64.rpm +aarch64: + +wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-pluginlib/ros-noetic-ros-pluginlib-1.13.0-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-pluginlib/ros-noetic-ros-pluginlib-1.13.0-1.oe2203.x86_64.rpm 2. 安装rpm包 -sudo rpm -ivh pluginlib-1.13.0-1.oe1.aarch64.rpm +aarch64: + +sudo rpm -ivh ros-noetic-ros-pluginlib-1.13.0-1.oe2203.aarch64.rpm --nodeps --force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-pluginlib-1.13.0-1.oe2203.x86_64.rpm --nodeps --force #### 使用说明 -安装完成以后，在/opt/ros/noetic/目录下有pluginlib/文件夹证明安装成功 +依赖环境安装: + +sh /opt/ros/noetic/install_dependence.sh + +安装完成以后，在/opt/ros/noetic/目录下有如下输出,则表示安装成功 + +输出: +``` +pluginlib/ +├── cmake.lock +├── env.sh +├── lib +│   ├── pkgconfig +│   │   └── pluginlib.pc +│   └── pluginlib +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── pluginlib + └── cmake +``` #### 参与贡献 diff --git a/pluginlib.spec b/pluginlib.spec index 8af55165b1bb77b49135de7ed72208b96b757133..f5ec25b24e37f352cbf6bcd3a5805a4eed5cb31c 100644 --- a/pluginlib.spec +++ b/pluginlib.spec @@ -1,7 +1,7 @@ -Name: pluginlib +Name: ros-noetic-ros-pluginlib Version: 1.13.0 Release: 1 -Summary: This is ROS noetic pluginlib 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/pluginlib-release/archive/release/noetic/pluginlib Source0: https://github.com/ros-gbp/pluginlib-release/archive/release/noetic/pluginlib/1.13.0-1.tar.gz @@ -14,7 +14,7 @@ BuildRequires: boost-devel %description -This is ROS noetic pluginlib Package. +This is %{name} Package %prep %setup @@ -52,8 +52,8 @@ cd .. cd .. - ./src/catkin/bin/catkin_make_isolated --install +cp install_dependence.sh install_isolated/ #### # 对install_isoloate内部的变量名称进行替换 @@ -71,12 +71,13 @@ mkdir -p %{buildroot}/opt/ros/noetic/ cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ + %files %defattr(-,root,root) /opt/ros/noetic/* /opt/ros/noetic/.rosinstall /opt/ros/noetic/.catkin + %changelog * Tue Dec 15 2020 openEuler Buildteam - 1.13.0-1 - Package init -