diff --git a/0.6.13-1.tar.gz b/0.6.13-1.tar.gz index a6bd26aca1d64ba471dac43703d89570d24605a1..87b25c6a785f9480ae6acf798d1aa2637a01d682 100644 Binary files a/0.6.13-1.tar.gz and b/0.6.13-1.tar.gz differ diff --git a/README.en.md b/README.en.md index d1ac90fc77e7068711d5e680aa97687eafc57d40..f583f4c49e475bb749061ee201f5269559da4643 100644 --- a/README.en.md +++ b/README.en.md @@ -12,7 +12,7 @@ roscpp_core include cpp_common , roscpp_serialization, roscpp_traits and rostime 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/roscpp_core-0.6.13-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/roscpp_core-0.6.13-1.oe1.aarch64.rpm 2. Install RPM @@ -20,7 +20,7 @@ sudo rpm -ivh roscpp_core-0.6.13-1.oe1.aarch64.rpm #### Instructions -Exit the roscpp_core file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful +Exit the roscpp_core file under the /opt/ros/melodic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 099b067ceb18fc3fd7ff1860b86b7de094209387..2c8697ba4bdca775d5fe73ef17b7212221d22570 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ roscpp_core包含cpp_common, roscpp_serialization , roscpp_traits 和 rostime 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/roscpp_core-0.6.13-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/roscpp_core-0.6.13-1.oe1.aarch64.rpm 2. 安装rpm包 @@ -20,7 +20,7 @@ sudo rpm -ivh roscpp_core-0.6.13-1.oe1.aarch64.rpm #### 使用说明 -安装完成以后,在/opt/ros/melodic/devel_isolated/目录下有roscpp_core/文件夹证明安装成功 +安装完成以后,在/opt/ros/melodic/目录下有roscpp_core/文件夹证明安装成功 #### 参与贡献 diff --git a/roscpp_core.spec b/roscpp_core.spec index b9107a5ae17a95f65f57280535969ce1326f53d5..38d4c44cfd363de3eb40d9d81b4a6a453b8f7c02 100644 --- a/roscpp_core.spec +++ b/roscpp_core.spec @@ -1,50 +1,23 @@ Name: roscpp_core Version: 0.6.13 -Release: 2 +Release: 3 Summary: This is ROS melodic roscpp_core Package -License: GPL +License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 URL: https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_core Source0: https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_traits/0.6.13-1.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: python-devel BuildRequires: python-setuptools -#Requires: python-empy -#BuildRequires: libjpeg-turbo-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 message_generation Package. +This is ROS melodic roscpp_core 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/ @@ -75,6 +48,7 @@ cd catkin_pkg-0.4.22/ python setup.py install --user cd .. + cd console_bridge/ mkdir build/ cd build/ @@ -84,28 +58,57 @@ make install cd .. cd .. +cd poco/ +mkdir cmake-build/ +mkdir cmake-release/ +cd cmake-build/ +cmake .. +make -j8 +make install cd .. cd .. -#compile -./src/catkin/bin/catkin_make_isolated +cd tinyxml2/ +mkdir build +cd build +cmake .. +make -j8 +make install +cd .. +cd .. -#install -mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/ +cd .. + -echo %{buildroot} +./src/catkin/bin/catkin_make_isolated --install +#### +# 对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/*` +#### +# 添加.catkin和.rosinstall文件 +# +#### +mkdir -p %{buildroot}/opt/ros/melodic/ +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/ +cp -r 3rdparty/install/* %{buildroot}/usr/local/ %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/roscpp_core.yaml b/roscpp_core.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2c6ddb23c604a6d471eb82685ba826bf0b156243 --- /dev/null +++ b/roscpp_core.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/roscpp_core.git +tag_prefix: 0.6.13-1 +separator: "."