diff --git a/1.12.1-0.tar.gz b/1.12.1-0.tar.gz index 12d805e33afe9fef971a07bfc4836d7e716f9b61..ef922f8ac81a4261222effe00e2e04a5f5d0f407 100644 Binary files a/1.12.1-0.tar.gz and b/1.12.1-0.tar.gz differ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..a67d4ac5bed76c454dbf6f0fb801c8e9bc5f36f3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 davidhan008 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.en.md b/README.en.md index 0f5e66961d1434d9067328bd1645d0d47677dbfe..fac35ee8108e6030e763c1efc555738904775024 100644 --- a/README.en.md +++ b/README.en.md @@ -12,7 +12,7 @@ Pluginlib includes The Plugin Description File and Registering/Exporting a Plug 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm 2. Install RPM @@ -20,7 +20,7 @@ sudo rpm -ivh pluginlib-1.12.1-1.oe1.aarch64.rpm #### Instructions -Exit the pluginlib file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful +Exit the pluginlib file under the /opt/ros/melodic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 80304ae00d6e1879897f73b08275b073af823093..0d66f989eb125a3f9f9a55da2f70ecabf195cc92 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Pluginlib 包含注册/导出插件的类和插件描述xml文件 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/pluginlib-1.12.1-1.oe1.aarch64.rpm 2. 安装rpm包 @@ -21,7 +21,7 @@ sudo rpm -ivh pluginlib-1.12.1-1.oe1.aarch64.rpm #### 使用说明 -安装完成以后，在/opt/ros/melodic/devel_isolated/目录下有pluginlib/文件夹证明安装成功 +安装完成以后，在/opt/ros/melodic/目录下有pluginlib/文件夹证明安装成功 #### 参与贡献 diff --git a/pluginlib.spec b/pluginlib.spec index 023f8ff3aeda4386b78c39086b3fe00e9a66f2a6..81d7c0705f0a6ca28dce333987753b882663c3e3 100644 --- a/pluginlib.spec +++ b/pluginlib.spec @@ -2,50 +2,24 @@ Name: pluginlib Version: 1.12.1 Release: 2 Summary: This is ROS melodic pluginlib Package -License: GPL +License: MIT URL: https://github.com/ros-gbp/pluginlib-release/archive/release/melodic/pluginlib Source0: https://github.com/ros-gbp/pluginlib-release/archive/release/melodic/pluginlib/1.12.1-0.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: python-devel BuildRequires: python-setuptools -#Requires: python-empy 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 + %description This is ROS melodic pluginlib Package. %prep %setup -#cd catkin-0.7.26/ - - - - -#%build - -#pwd -#mkdir build/ -#cd build/ && cmake .. - - %install -pwd - -#mkdir -p build/ -#cd build/ -#cmake .. -#cd .. - -cd src/ cd 3rdparty/ cd empy-3.3.4/ @@ -81,7 +55,7 @@ cd console_bridge/ mkdir build/ cd build/ cmake .. -make +make -j8 make install cd .. cd .. @@ -101,36 +75,42 @@ cd tinyxml2/ mkdir build cd build cmake .. -make -j5 +make -j8 make install cd .. cd .. - -cd .. cd .. +./src/catkin/bin/catkin_make_isolated --install -#compile -./src/catkin/bin/catkin_make_isolated +#### +# 对install_isoloate内部的变量名称进行替换 +# +#### +SRC_PATH=$PWD/install_isolated +DST_PATH=/opt/ros/melodic +sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` - -#install +#### +# 添加.catkin和.rosinstall文件 +# +#### mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/ - -echo %{buildroot} - +mkdir -p %{buildroot}/usr/local/ +cp -r install_isolated/* %{buildroot}/opt/ros/melodic/ +cp install_isolated/.rosinstall %{buildroot}/opt/ros/melodic/ +cp install_isolated/.catkin %{buildroot}/opt/ros/melodic/ %files -#%defattr(-,root,root) -#/opt/ros/melodic/* +%defattr(-,root,root) /opt/ros/melodic/* -#/usr/lib/share/catkin/cmake/* - +/opt/ros/melodic/.rosinstall +/opt/ros/melodic/.catkin +/usr/local/* %changelog -* Thu May 28 2020 openEuler Buildteam - 19.4-1 +* Thu 12-15-2020 openEuler Buildteam - Package init diff --git a/pluginlib.yaml b/pluginlib.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bd3d38d56f532c12611c09a6eba4794bcda1b37d --- /dev/null +++ b/pluginlib.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/pluginlib.git +tag_prefix: 1.12.1-0 +separator: "." \ No newline at end of file