Skip to content

Commit

Permalink
Addressing comments
Browse files Browse the repository at this point in the history
  • Loading branch information
agosh01 committed Jul 11, 2024
1 parent 896e642 commit a3e0fab
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 23 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ With Conan 2:
conan create --version 1.6.0 --build=missing up-core-api/release/
conan create --version 1.0.0-rc0 --build=missing up-cpp/release/
conan create --version 1.0.0-rc0 --build=missing up-transport-zenoh-cpp/release/
conan create --version 0.1.0 --build=missing up-transport-vsomeip-cpp/release/
```

## Building Developer Packages
Expand Down
4 changes: 3 additions & 1 deletion up-cpp/release/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
url: "https://github.com/eclipse-uprotocol/up-cpp/archive/337b4f4b4193fece4d7067ef754b41ea323e1f96.tar.gz"
sha256: "f65fd40e3ba8914e70d3a4a9e5426b646ad6299c94841ff42a918fe75513e128"
requirements:
protobuf: "[>=3.21.12]"
protobuf: "3.21.12"
up-core-api: "1.6.0"
spdlog: "1.13.0"
test-requirements:
gtest: "1.14.0"


13 changes: 4 additions & 9 deletions up-cpp/release/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class upCoreApiRecipe(ConanFile):
license = "Apache-2.0"
author = "Contributors to the Eclipse Foundation <uprotocol-dev@eclipse.org>"
url = "https://github.com/eclipse-uprotocol/up-transport-zenoh-cpp"
description = "This library provides a Zenoh-based uProtocol transport for C++ uEntities"
description = "This library provides a C++ uProtocol API for the development of uEntities"
topics = ("automotive", "iot", "uprotocol", "messaging")

# Binary configuration
Expand All @@ -27,23 +27,18 @@ class upCoreApiRecipe(ConanFile):
"fPIC": True,
}

test_requires = "gtest/1.14.0"

def requirements(self):
version_data = self.conan_data[self.version]
if "requirements" in version_data:
for requirement, version in version_data["requirements"].items():
self.requires(f"{requirement}/{version}")
if "test-requirements" in version_data:
for requirement, version in version_data["test-requirements"].items():
self.test_requires(f"{requirement}/{version}")
else:
self.output.warning("No requirements specified in conandata.yml. Please check your configuration.")


# We are providing our own cmake config since one is not included in the
# spec repo.
def export_sources(self):
copy(self, "CMakeLists.txt",
self.recipe_folder + "/..", self.export_sources_folder)

def source(self):
get(self, **self.conan_data[self.version]["sources"], strip_root=True)

Expand Down
9 changes: 6 additions & 3 deletions up-transport-zenoh-cpp/release/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
requirements:
zenohcpp: "0.11.0"
up-cpp: "1.0.0-rc0"
up-core-api: "[>=1.5.8]"
spdlog: "[>=1.13.0]"
protobuf: "[>=3.21.12]"
up-core-api: "1.6.0"
spdlog: "1.13.0"
protobuf: "3.21.12"
test-requirements:
gtest: "1.14.0"

12 changes: 3 additions & 9 deletions up-transport-zenoh-cpp/release/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,16 @@ class upZenohTransportRecipe(ConanFile):
"fPIC": True,
}

test_requires = "gtest/1.14.0"

def requirements(self):
version_data = self.conan_data[self.version]
if "requirements" in version_data:
for requirement, version in version_data["requirements"].items():
self.requires(f"{requirement}/{version}")
if "test-requirements" in version_data:
for requirement, version in version_data["test-requirements"].items():
self.test_requires(f"{requirement}/{version}")
else:
self.output.warning("No requirements specified in conandata.yml. Please check your configuration.")


# We are providing our own cmake config since one is not included in the
# spec repo.
def export_sources(self):
copy(self, "CMakeLists.txt",
self.recipe_folder + "/..", self.export_sources_folder)

def source(self):
get(self, **self.conan_data[self.version]["sources"], strip_root=True)
Expand Down

0 comments on commit a3e0fab

Please sign in to comment.