diff --git a/0.9.9.tar.gz b/0.9.11.tar.gz similarity index 61% rename from 0.9.9.tar.gz rename to 0.9.11.tar.gz index 717619f791f9eb703bc74a915f86ec6b194545d0..9d2201dae9cb0574fc0bbd8126122db5a49ca7c7 100644 Binary files a/0.9.9.tar.gz and b/0.9.11.tar.gz differ diff --git a/README.en.md b/README.en.md index d8c8cd4c1052113cd2fe75127c4a8851ff532147..c1cf3b10b478133ef94240467c248bb98ec7afde 100644 --- a/README.en.md +++ b/README.en.md @@ -38,19 +38,87 @@ input: ``` #### Installation -1. Dowload RPM +1. Download RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ament_cmake-0.9.9-1.oe1.aarch64.rpm +aarch64: + +``` +wget https://117.78.1.88/build/home:Chenjy3_22.03/openEuler_22.03_LTS_standard_aarch64/aarch64/ament_cmake/ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.aarch64.rpm +``` + +x86_64: + +``` +wget https://117.78.1.88/build/home:Chenjy3_22.03/openEuler_22.03_LTS_standard_x86_64/x86_64/ament_cmake/ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.x86_64.rpm +``` 2. Install RPM -sudo rpm -ivh ament_cmake-0.9.9-1.oe1.aarch64.rpm +aarch64: + +``` +sudo rpm -ivh --nodeps --force ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.aarch64.rpm +``` + +x86_64: + +``` +sudo rpm -ivh --nodeps --force ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.x86_64.rpm +``` #### Instructions -Exit the ament_cmake file under the /opt/ros/foxy/ directory , Prove that the software installation is successful +Dependence installation: + +``` +sh /opt/ros/foxy/install_dependence.sh +``` + +Exit the following output file under the /opt/ros/foxy/ directory,Prove that the software installation is successful. -output: includes cmake utils for ros2 +output: +``` +./ +|-- COLCON_IGNORE +|-- install_dependence.sh +|-- _local_setup_util_ps1.py +|-- _local_setup_util_sh.py +|-- lib +| `-- python3.9 +|-- local_setup.bash +|-- local_setup.ps1 +|-- local_setup.sh +|-- local_setup.zsh +|-- setup.bash +|-- setup.ps1 +|-- setup.sh +|-- setup.zsh +`-- share + |-- ament_cmake + |-- ament_cmake_auto + |-- ament_cmake_core + |-- ament_cmake_export_definitions + |-- ament_cmake_export_dependencies + |-- ament_cmake_export_include_directories + |-- ament_cmake_export_interfaces + |-- ament_cmake_export_libraries + |-- ament_cmake_export_link_flags + |-- ament_cmake_export_targets + |-- ament_cmake_gmock + |-- ament_cmake_google_benchmark + |-- ament_cmake_gtest + |-- ament_cmake_include_directories + |-- ament_cmake_libraries + |-- ament_cmake_nose + |-- ament_cmake_pytest + |-- ament_cmake_python + |-- ament_cmake_target_dependencies + |-- ament_cmake_test + |-- ament_cmake_version + |-- ament_index + |-- ament_package + `-- colcon-core +``` #### Contribution diff --git a/README.md b/README.md index 46030599c107f8fa155c8424b7e9c0742271dd5b..a37d7abec960efaa609874ed203ba60c6c4054d3 100644 --- a/README.md +++ b/README.md @@ -41,17 +41,86 @@ https://github.com/ament/ament_cmake.git 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/ament_cmake-0.9.9-1.oe1.aarch64.rpm +aarch64: + +``` +wget https://117.78.1.88/build/home:Chenjy3_22.03/openEuler_22.03_LTS_standard_aarch64/aarch64/ament_cmake/ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.aarch64.rpm +``` + +x86_64: + +``` +wget https://117.78.1.88/build/home:Chenjy3_22.03/openEuler_22.03_LTS_standard_x86_64/x86_64/ament_cmake/ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.x86_64.rpm +``` 2. 安装rpm包 -sudo rpm -ivh ament_cmake-0.9.9-1.oe1.aarch64.rpm +aarch64: + +``` +sudo rpm -ivh --nodeps --force ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.aarch64.rpm +``` + +x86_64: + +``` +sudo rpm -ivh --nodeps --force ros2-foxy-ros2-ament_cmake-0.9.11-2.oe2203.x86_64.rpm +``` #### 使用说明 -安装完成以后，在/opt/ros/foxy/目录下有ament_cmake/文件夹证明安装成功 +依赖环境安装: + +``` +sh /opt/ros/foxy/install_dependence.sh +``` + +安装完成以后，在/opt/ros/foxy/目录下如下输出,则表示安装成功。 + +输出: -输出文件: 输入关于ros2中关于cmake的集合 +``` +./ +|-- COLCON_IGNORE +|-- install_dependence.sh +|-- _local_setup_util_ps1.py +|-- _local_setup_util_sh.py +|-- lib +| `-- python3.9 +|-- local_setup.bash +|-- local_setup.ps1 +|-- local_setup.sh +|-- local_setup.zsh +|-- setup.bash +|-- setup.ps1 +|-- setup.sh +|-- setup.zsh +`-- share + |-- ament_cmake + |-- ament_cmake_auto + |-- ament_cmake_core + |-- ament_cmake_export_definitions + |-- ament_cmake_export_dependencies + |-- ament_cmake_export_include_directories + |-- ament_cmake_export_interfaces + |-- ament_cmake_export_libraries + |-- ament_cmake_export_link_flags + |-- ament_cmake_export_targets + |-- ament_cmake_gmock + |-- ament_cmake_google_benchmark + |-- ament_cmake_gtest + |-- ament_cmake_include_directories + |-- ament_cmake_libraries + |-- ament_cmake_nose + |-- ament_cmake_pytest + |-- ament_cmake_python + |-- ament_cmake_target_dependencies + |-- ament_cmake_test + |-- ament_cmake_version + |-- ament_index + |-- ament_package + `-- colcon-core +``` #### 参与贡献 diff --git a/ament_cmake.spec b/ament_cmake.spec index bbf6fffd3746239aad2064b7a98ca2d70c6759a5..0e1c3cff840243c97abeab2c713ff50f5e4b32bf 100644 --- a/ament_cmake.spec +++ b/ament_cmake.spec @@ -1,10 +1,10 @@ -Name: ament_cmake -Version: 0.9.9 -Release: 1 -Summary: This is ROS2 foxy ament_cmake 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 +Name: ros2-foxy-ros2-ament_cmake +Version: 0.9.11 +Release: 2 +Summary: This is ROS2 foxy %{name} Package +License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 URL: https://github.com/ament/ament_cmake.git -Source0: https://github.com/ament/ament_cmake/archive/refs/tags/0.9.9.tar.gz +Source0: https://github.com/ament/ament_cmake/archive/refs/tags/0.9.11.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: python3-devel @@ -14,13 +14,13 @@ BuildRequires: asio-devel BuildRequires: git %description -This is ROS2 foxy ament_cmake Package. +This is ROS2 foxy %{name} Package. %prep %setup %install -cd 3rdparty/ +cd 3rdparty/ cd empy-3.3.4/ python3 setup.py install --user @@ -128,7 +128,7 @@ cd PyYAML-6.0 python3 setup.py install --user cd .. -cd setuptools-50.0.0 +cd setuptools-60.0.0 python3 setup.py install --user cd .. @@ -142,7 +142,6 @@ cd .. cd .. - # for colcon build tools cd build_tools export BUILD_WORSPCE=$PWD @@ -153,6 +152,7 @@ cd .. # for workspace cd workspace colcon build --merge-install +cp ../install_dependence.sh install/ #### # 对install内部的变量名称进行替换 @@ -179,7 +179,9 @@ cp -r install/* %{buildroot}/opt/ros/foxy/ /opt/ros/foxy/* %changelog -* Thu 11-30-2021 openEuler Buildteam +* Wed Sep 21 2022 openEuler Buildteam - 0.9.11-2 +- Update Package to OpenEuler 22.03 +* Thu Nov 30 2021 openEuler Buildteam - 0.9.9-1 - Package init -* Thu 01-04-2022 openEuler Buildteam +* Thu Jan 4 2022 openEuler Buildteam - 0.9.9-1 - Package update diff --git a/ament_cmake.yaml b/ament_cmake.yaml index 74cd1174aa4de61c4798e62029cc11a7b70445c5..7484183c4eae7962027f9c5ccd6bcc7f103de26f 100644 --- a/ament_cmake.yaml +++ b/ament_cmake.yaml @@ -1,5 +1,5 @@ --- version_control: git src_repo: https://github.com/ament/ament_cmake.git -tag_prefix: 0.9.9 +tag_prefix: 0.9.11 separator: "."