diff --git a/0.4.14-1.tar.gz b/0.4.14-1.tar.gz index acaf0a89bdbd0f4eced234c8aae06116fc3826c6..ed3f9178e3b422e4e11c806eb9d7760b03cecd94 100644 Binary files a/0.4.14-1.tar.gz and b/0.4.14-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 9b096cecec982a89a6105872f4d6b6a923774b95..481df16933ba746409ad661bb2ae9d724c2721ba 100644 --- a/README.en.md +++ b/README.en.md @@ -12,22 +12,83 @@ The rqt_graph contains the following methods: Its components are made generic so that other packages where you want to achieve graph representation can depend upon this pkg (use rqt_dep to find out the pkgs that depend. rqt_dep itself depends on rqt_graph too). - ![输入图片说明](https://images.gitee.com/uploads/images/2021/1030/181957_37e9502b_1226697.png "屏幕截图_1867.png") +input: +``` +├── CHANGELOG.rst +├── CMakeLists.txt +├── mainpage.dox +├── package.xml +├── plugin.xml +├── resource +│   └── RosGraph.ui +├── scripts +│   └── rqt_graph +├── setup.py +├── src +│   └── rqt_graph +└── test + └── dotcode_test.py +``` + #### 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-rqt_graph/ros-noetic-ros-rqt_graph-0.4.14-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-rqt_graph/ros-noetic-ros-rqt_graph-0.4.14-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/rqt_graph-0.4.14-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-rqt_graph-0.4.14-1.oe2203.aarch64.rpm --nodeps --force -2. Install RPM +x86_64: -sudo rpm -ivh rqt_graph-0.4.14-1.oe1.aarch64.rpm +sudo rpm -ivh ros-noetic-ros-rqt_graph-0.4.14-1.oe2203.x86_64.rpm --nodeps --force #### Instructions -Exit the rqt_graph 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 + +``` +rqt_graph/ +├── bin +│   ├── cmake.lock +│   └── rqt_graph +├── cmake.lock +├── env.sh +├── lib +│   ├── pkgconfig +│   │   └── rqt_graph.pc +│   ├── python2.7 +│   │   └── dist-packages +│   └── rqt_graph +│   ├── cmake.lock +│   └── rqt_graph +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── rqt_graph + └── cmake + +``` #### Contribution diff --git a/README.md b/README.md index e2e1844364ab82df09a3220668551e750ff6a2f9..46ba4a6bdcddaee1889c6dcda3ee18839817e9e3 100644 --- a/README.md +++ b/README.md @@ -13,21 +13,83 @@ rqt_graph包含以下方法： ![输入图片说明](https://images.gitee.com/uploads/images/2021/1030/181957_37e9502b_1226697.png "屏幕截图_1867.png") +文件内容: +``` +├── CHANGELOG.rst +├── CMakeLists.txt +├── mainpage.dox +├── package.xml +├── plugin.xml +├── resource +│   └── RosGraph.ui +├── scripts +│   └── rqt_graph +├── setup.py +├── src +│   └── rqt_graph +└── test + └── dotcode_test.py +``` #### 安装教程 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/rqt_graph-0.4.14-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-rqt_graph/ros-noetic-ros-rqt_graph-0.4.14-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-rqt_graph/ros-noetic-ros-rqt_graph-0.4.14-1.oe2203.x86_64.rpm 2. 安装rpm包 -sudo rpm -ivh rqt_graph-0.4.14-1.oe1.aarch64.rpm +aarch64: + +sudo rpm -ivh ros-noetic-ros-rqt_graph-0.4.14-1.oe2203.aarch64.rpm --nodeps --force + +x86_64: + +sudo rpm -ivh ros-noetic-ros-rqt_graph-0.4.14-1.oe2203.x86_64.rpm --nodeps --force #### 使用说明 -安装完成以后，在/opt/ros/noetic/devel_isolated/目录下有rqt_graph/文件夹证明安装成功 +依赖环境安装: + +sh /opt/ros/noetic/install_dependence.sh + +安装完成以后，在/opt/ros/noetic/目录下有如下输出,则表示安装成功 + +输出: +``` +rqt_graph/ +├── bin +│   ├── cmake.lock +│   └── rqt_graph +├── cmake.lock +├── env.sh +├── lib +│   ├── pkgconfig +│   │   └── rqt_graph.pc +│   ├── python2.7 +│   │   └── dist-packages +│   └── rqt_graph +│   ├── cmake.lock +│   └── rqt_graph +├── local_setup.bash +├── local_setup.sh +├── local_setup.zsh +├── setup.bash +├── setup.sh +├── _setup_util.py +├── setup.zsh +└── share + └── rqt_graph + └── cmake +``` + #### 参与贡献 diff --git a/rqt_graph.spec b/rqt_graph.spec index c65e8fdb62dae9133a5b7a6e148b2cfdef890ddf..01d3042849319502a2e4163a92f973081f42cfab 100644 --- a/rqt_graph.spec +++ b/rqt_graph.spec @@ -1,7 +1,7 @@ -Name: rqt_graph +Name: ros-noetic-ros-rqt_graph Version: 0.4.14 Release: 1 -Summary: This is ROS noetic navigation 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/rqt_graph-release/archive/release/noetic/rqt_graph Source0: https://github.com/ros-gbp/rqt_graph-release/archive/release/noetic/rqt_graph/0.4.14-1.tar.gz @@ -26,9 +26,8 @@ BuildRequires: libpng-devel BuildRequires: libtool-ltdl-devel BuildRequires: fltk-devel - %description -This is ROS noetic rqt_graph Package. +This is %{name} Package %prep %setup @@ -81,6 +80,7 @@ cd .. ./src/catkin/bin/catkin_make_isolated --install +cp install_dependence.sh install_isolated/ #### # 对install_isoloate内部的变量名称进行替换 @@ -99,14 +99,12 @@ 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/noetic/* /opt/ros/noetic/.rosinstall /opt/ros/noetic/.catkin -#/usr/local/* %changelog