Skip to content

Commit 90dbe6b

Browse files
authored
Move rclrs_examples to examples/minimal_pub_sub (#163)
1 parent 744aa91 commit 90dbe6b

File tree

9 files changed

+53
-18
lines changed

9 files changed

+53
-18
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
cd ${{ steps.build.outputs.ros-workspace-directory-name }}
9393
. /opt/ros/${{ matrix.ros_distro }}/setup.sh
94-
for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "rclrs_examples" { print $2 }'); do
94+
for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" { print $2 }'); do
9595
cd $path
9696
echo "Running rustdoc check in $path"
9797
cargo rustdoc -- -D warnings

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ git clone https://github.com/ros2-rust/ros2_rust.git src/ros2_rust
5555
vcs import src < src/ros2_rust/ros2_rust_foxy.repos
5656
. /opt/ros/foxy/setup.sh
5757
cd /src
58-
colcon build --packages-up-to rclrs_examples
58+
colcon build --packages-up-to examples_rclrs_minimal_pub_sub
5959
```
6060

6161
It's normal to see a `Some selected packages are already built in one or more underlay workspace` warning. This is because the standard message definitions that are part of ROS 2 need to be regenerated in order to create Rust bindings.
@@ -75,10 +75,10 @@ As an example, here is how to build `rclcrs_examples` with `cargo`:
7575
```
7676
# Initial build of the package with colcon
7777
# Compare .cargo/config.toml with and without the --lookup-in-workspace flag to see its effect
78-
colcon build --packages-up-to rclrs_examples --lookup-in-workspace
78+
colcon build --packages-up-to examples_rclrs_minimal_pub_sub --lookup-in-workspace
7979
# Source the install directory
8080
. install/setup.sh
81-
cd rclrs_examples
81+
cd examples_rclrs_minimal_pub_sub
8282
# Run cargo build, or cargo check, cargo doc, etc.
8383
cargo build
8484
```
@@ -90,15 +90,15 @@ Publisher:
9090
```
9191
# Do this in a new terminal
9292
. ./install/setup.sh
93-
ros2 run rclrs_examples minimal_publisher
93+
ros2 run examples_rclrs_minimal_pub_sub minimal_publisher
9494
```
9595

9696
Subscriber:
9797

9898
```
9999
# Do this in a new terminal
100100
. ./install/setup.sh
101-
ros2 run rclrs_examples minimal_subscriber
101+
ros2 run examples_rclrs_minimal_pub_sub minimal_subscriber
102102
```
103103

104104
Enjoy!

examples/message_demo/Cargo.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
name = "examples_rclrs_message_demo"
3+
version = "0.2.0"
4+
authors = ["Nikolai Morin <[email protected]>"]
5+
edition = "2021"
6+
7+
[[bin]]
8+
name = "message_demo"
9+
path = "src/message_demo.rs"
10+
11+
[dependencies]
12+
anyhow = {version = "1", features = ["backtrace"]}
13+
14+
[dependencies.rclrs]
15+
version = "*"
16+
17+
[dependencies.rosidl_runtime_rs]
18+
version = "*"
19+
20+
[dependencies.rclrs_example_msgs]
21+
version = "*"

examples/message_demo/package.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0"?>
2+
<?xml-model
3+
href="http://download.ros.org/schema/package_format3.xsd"
4+
schematypens="http://www.w3.org/2001/XMLSchema"?>
5+
<package format="3">
6+
<name>examples_rclrs_message_demo</name>
7+
<version>0.2.0</version>
8+
<description>Package containing an example of message-related functionality in rclrs.</description>
9+
<maintainer email="[email protected]">Nikolai Morin</maintainer>
10+
<license>Apache License 2.0</license>
11+
12+
<build_depend>rclrs</build_depend>
13+
<build_depend>rosidl_runtime_rs</build_depend>
14+
<build_depend>rclrs_example_msgs</build_depend>
15+
16+
<exec_depend>rclrs</exec_depend>
17+
<exec_depend>rosidl_runtime_rs</exec_depend>
18+
<exec_depend>rclrs_example_msgs</exec_depend>
19+
20+
<export>
21+
<build_type>ament_cargo</build_type>
22+
</export>
23+
</package>

rclrs_examples/Cargo.toml renamed to examples/minimal_pub_sub/Cargo.toml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "rclrs_examples"
2+
name = "examples_rclrs_minimal_pub_sub"
33
version = "0.2.0"
44
authors = ["Esteve Fernandez <[email protected]>"]
55
edition = "2021"
@@ -12,10 +12,6 @@ path = "src/minimal_subscriber.rs"
1212
name = "minimal_publisher"
1313
path = "src/minimal_publisher.rs"
1414

15-
[[bin]]
16-
name = "message_demo"
17-
path = "src/message_demo.rs"
18-
1915
[dependencies]
2016
anyhow = {version = "1", features = ["backtrace"]}
2117

@@ -27,6 +23,3 @@ version = "*"
2723

2824
[dependencies.std_msgs]
2925
version = "*"
30-
31-
[dependencies.rclrs_example_msgs]
32-
version = "*"

rclrs_examples/package.xml renamed to examples/minimal_pub_sub/package.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
href="http://download.ros.org/schema/package_format3.xsd"
44
schematypens="http://www.w3.org/2001/XMLSchema"?>
55
<package format="3">
6-
<name>rclrs_examples</name>
6+
<name>examples_rclrs_minimal_pub_sub</name>
77
<version>0.2.0</version>
8-
<description>Package containing examples of how to use the rclrs API.</description>
8+
<description>Package containing an example of the publish-subscribe mechanism in rclrs.</description>
99
<maintainer email="[email protected]">Esteve Fernandez</maintainer>
1010
<license>Apache License 2.0</license>
1111

1212
<build_depend>rclrs</build_depend>
1313
<build_depend>rosidl_runtime_rs</build_depend>
1414
<build_depend>std_msgs</build_depend>
15-
<build_depend>rclrs_example_msgs</build_depend>
1615

1716
<exec_depend>rclrs</exec_depend>
1817
<exec_depend>rosidl_runtime_rs</exec_depend>
1918
<exec_depend>std_msgs</exec_depend>
20-
<exec_depend>rclrs_example_msgs</exec_depend>
2119

2220
<export>
2321
<build_type>ament_cargo</build_type>

0 commit comments

Comments
 (0)