Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring zenoh router via vendor. #63

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Bring zenoh router via vendor. #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7fbeb4
Bring zenoh router via vendor.
francocipollone Nov 9, 2023
e1e5cda
Updates readme.
francocipollone Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ Install latest rustc.
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
```

Install zenohd router
> Note: The manual zenoh router installation won't be required in the future.
```bash
echo "deb [trusted=yes] https://download.eclipse.org/zenoh/debian-repo/ /" | sudo tee -a /etc/apt/sources.list > /dev/null
sudo apt update && sudo apt install zenoh -y
```

Build `rmw_zenoh_cpp`

```bash
Expand Down
1 change: 1 addition & 0 deletions rmw_zenoh_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>zenoh_c_vendor</build_depend>
<build_depend>zenohd_vendor</build_depend>

<depend>ament_index_cpp</depend>
<depend>fastcdr</depend>
Expand Down
33 changes: 33 additions & 0 deletions zenohd_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
cmake_minimum_required(VERSION 3.16)
project(zenohd_vendor)

# Default to C++17
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()

find_package(ament_cmake REQUIRED)

include(ExternalProject)

ExternalProject_Add(
zenoh
PREFIX ${CMAKE_BINARY_DIR}/_cargo_deps
GIT_REPOSITORY https://github.com/eclipse-zenoh/zenoh.git
GIT_TAG master
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think for consistency, we should probably pin this to a particular hash. But I think we should also do the same thing for zenoh_c_vendor, so I'll open a separate PR doing that.

BUILD_COMMAND cargo build --package zenohd --release
CONFIGURE_COMMAND "" # Disable the configure step
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)

# Install the zenohd executable from the rust crate
install(
PROGRAMS ${CMAKE_BINARY_DIR}/_cargo_deps/src/zenoh/target/release/zenohd
DESTINATION bin
)

# TODO(francocipollone): Install zenoh router plugins
clalancette marked this conversation as resolved.
Show resolved Hide resolved

ament_package()
17 changes: 17 additions & 0 deletions zenohd_vendor/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>zenohd_vendor</name>
<version>0.0.1</version>
<description>Vendor pkg to install zenoh router</description>
<maintainer email="[email protected]">FrancoCipollone</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<!-- <build_depend>cargo</build_depend> -->

<export>
<build_type>ament_cmake</build_type>
</export>
</package>
Loading