Skip to content

Commit

Permalink
Made DDS domain configurable by command line arg (#27) and introduce …
Browse files Browse the repository at this point in the history
…the specification of an allow regular expression (#16)
  • Loading branch information
kydos committed Mar 16, 2021
2 parents c7dee97 + 5ee94c3 commit cc36d42
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,13 @@ jobs:
cmake ..
sudo cmake --build . --target install
- name: Install latest nightly
- uses: actions/checkout@v2

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
components: rustfmt, clippy

- uses: actions/checkout@v2

- name: Run cargo check
uses: actions-rs/cargo@v1
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,14 @@ In order to get running with the DDS plugin for zenoh you need first to install
- [CMake](https://cmake.org/download/)
- Your favourite C/C++ Compiler
- [Rust](https://www.rust-lang.org/tools/install)
- Rust nightly is currently required. Once initial Rust setup is finished via rustup, install nightly:
- ```
rustup install nightly
```

Once these dependencies are in place, simply do:

```
$ git clone https://github.com/eclipse-zenoh/zenoh-plugin-dds.git
$ cd zenoh-plugin-dds
$ ./config.sh
$ cargo +nightly build --release --all-targets
$ cargo build --release --all-targets
```

Assuming you want to try this with ROS2, then install it by following the instructions available [here](https://index.ros.org/doc/ros2/Installation/Foxy/).
Expand Down
2 changes: 1 addition & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ case "${unameOut}" in
*) target=Other
esac

if [ -v CYCLONE_INCLUDE ] && [ -v CYCLONE_LIB ]; then
if [[ "$CYCLONE_INCLUDE" ]] && [[ "$CYCLONE_LIB" ]]; then
echo "Looking for Cyclone installation at: $CYCLONE_ROOT"
if [ ! -e $CYCLONE_INCLUDE/dds/ddsc/dds_public_impl.h ]; then
echo "Could not find cyclone installation at $CYCLONE_ROOT"
Expand Down

0 comments on commit cc36d42

Please sign in to comment.